lib/tdiary.rb in tdiary-5.0.7 vs lib/tdiary.rb in tdiary-5.0.8

- old
+ new

@@ -9,13 +9,13 @@ Encoding::default_external = 'UTF-8' require 'tdiary/version' TDIARY_VERSION = TDiary::VERSION -$:.unshift File.join(File::dirname(__FILE__), '../misc/lib').untaint +$:.unshift File.join(File::dirname(__FILE__), '../misc/lib') ['../misc/lib/*/lib', '../vendor/*/lib'].each do |path| - Dir[File.join(File.dirname(__FILE__), path)].each {|dir| $:.unshift dir.untaint } + Dir[File.join(File.dirname(__FILE__), path)].each {|dir| $:.unshift dir } end require 'cgi' require 'uri' require 'fileutils' @@ -28,11 +28,11 @@ # # module TDiary # module TDiary - PATH = File::dirname( __FILE__ ).untaint + PATH = File::dirname( __FILE__ ) # tDiary configuration class, initialize tdiary.conf and stored configuration. autoload :Configuration, 'tdiary/configuration' autoload :Config, 'tdiary/configuration' # tDiary plugin class, loading all Plugin and eval plugins in view context. @@ -124,10 +124,10 @@ File.expand_path('..', __FILE__) end # directory where the server was started def server_root - Dir.pwd.untaint + Dir.pwd end def configuration @@configuration ||= Configuration.new end