diff options
| author | gbuesing <gbuesing@gmail.com> | 2008-09-14 18:16:50 -0500 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-09-14 18:16:50 -0500 |
| commit | d95943b276d52c5bc4f033e532376667badbad9f (patch) | |
| tree | ee46cc372920fa72c4014f8f6860181bc4ea04f1 /activerecord/lib | |
| parent | 9c4730d01e892df8d5c5493a08e0cddf0de5d575 (diff) | |
| download | rails-d95943b276d52c5bc4f033e532376667badbad9f.tar.gz rails-d95943b276d52c5bc4f033e532376667badbad9f.tar.bz2 rails-d95943b276d52c5bc4f033e532376667badbad9f.zip | |
Multiparameter attributes skip time zone conversion for time-only columns [#1030 state:resolved]
Diffstat (limited to 'activerecord/lib')
| -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 91b69747e0..b20da512eb 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2730,7 +2730,7 @@ module ActiveRecord #:nodoc: end def instantiate_time_object(name, values) - if self.class.time_zone_aware_attributes && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym) + if self.class.send(:create_time_zone_conversion_attribute?, name, column_for_attribute(name)) Time.zone.local(*values) else Time.time_with_datetime_fallback(@@default_timezone, *values) |