diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-06-04 03:47:10 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-06-04 03:47:10 -0700 |
| commit | 2186540f9160b47e075b9926d12d3a6843e95d31 (patch) | |
| tree | 26c5a95e9ba7ec2eeb804e34a5a9ab4ab9994c60 /activerecord/lib/active_record/attribute_methods | |
| parent | d10eb699649f9d7fa7e51ae1b633545d6a55e1ad (diff) | |
| parent | 635032fe3ba3d189e9c62eadb6e604f22669414d (diff) | |
| download | rails-2186540f9160b47e075b9926d12d3a6843e95d31.tar.gz rails-2186540f9160b47e075b9926d12d3a6843e95d31.tar.bz2 rails-2186540f9160b47e075b9926d12d3a6843e95d31.zip | |
Merge pull request #6619 from kennyj/fix_6591
Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index ac31b636db..58a5d82e14 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -57,8 +57,9 @@ module ActiveRecord time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time end time = time.in_time_zone rescue nil if time + changed = read_attribute(:#{attr_name}) != time write_attribute(:#{attr_name}, original_time) - #{attr_name}_will_change! + #{attr_name}_will_change! if changed @attributes_cache["#{attr_name}"] = time end EOV |