From 2920bd22df21e9920b749ce3901522d494d551b7 Mon Sep 17 00:00:00 2001 From: Geoff Buesing Date: Sat, 16 Feb 2008 20:47:01 +0000 Subject: ActiveRecord::Base#instantiate_time_object only uses Time.zone when Base.time_zone_aware_attributes is true; leverages Time#time_with_datetime_fallback for readability git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8882 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 481214c23c..a25d9789d7 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2461,10 +2461,10 @@ module ActiveRecord #:nodoc: end def instantiate_time_object(name, values) - if Time.zone && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym) + if Time.zone && self.class.time_zone_aware_attributes && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym) Time.zone.local(*values) else - @@default_timezone == :utc ? Time.utc_time(*values) : Time.local_time(*values) + Time.time_with_datetime_fallback(@@default_timezone, *values) end end -- cgit v1.2.3