diff options
author | gbuesing <gbuesing@gmail.com> | 2008-05-08 22:21:51 -0500 |
---|---|---|
committer | gbuesing <gbuesing@gmail.com> | 2008-05-08 22:21:51 -0500 |
commit | 79e44a5ee484f977c2cad8a4cffe882b816340a1 (patch) | |
tree | 51809b888cb5047cced8189620fb0bb4e4387b1c /activerecord/lib/active_record | |
parent | 4f03190f262c07c1f389957ff7ae76901495d824 (diff) | |
download | rails-79e44a5ee484f977c2cad8a4cffe882b816340a1.tar.gz rails-79e44a5ee484f977c2cad8a4cffe882b816340a1.tar.bz2 rails-79e44a5ee484f977c2cad8a4cffe882b816340a1.zip |
Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true
Diffstat (limited to 'activerecord/lib/active_record')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 12234184c1..b600e8ecfd 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2571,7 +2571,7 @@ module ActiveRecord #:nodoc: end def instantiate_time_object(name, values) - if Time.zone && self.class.time_zone_aware_attributes && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym) + if self.class.time_zone_aware_attributes && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym) Time.zone.local(*values) else Time.time_with_datetime_fallback(@@default_timezone, *values) |