added vendored_rails check for time zone setting

This commit is contained in:
Adam Meehan 2008-05-14 11:22:44 +10:00
parent f30b09cf5b
commit 10856b32d0

View File

@ -9,16 +9,19 @@ if File.exists?(File.dirname(__FILE__) + '/../../../../vendor/rails')
require 'activerecord/lib/active_record' require 'activerecord/lib/active_record'
require 'railties/lib/rails/version' require 'railties/lib/rails/version'
vendored_rails = true
puts "Using vendored Rails version #{Rails::VERSION::STRING}" puts "Using vendored Rails version #{Rails::VERSION::STRING}"
else else
require 'active_record' require 'active_record'
require 'active_record/version' require 'active_record/version'
require 'rails/version' require 'rails/version'
vendored_rails = false
puts "Using gem Rails version #{Rails::VERSION::STRING}" puts "Using gem Rails version #{Rails::VERSION::STRING}"
end end
Time.zone_default = Time.send!(:get_zone, 'UTC')
Time.zone_default = Time.send!(:get_zone, 'UTC') if vendored_rails
require 'validates_timeliness' require 'validates_timeliness'