diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
| commit | 6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52 (patch) | |
| tree | 96bd668692b62d3829322232877b70c9011ce446 /activerecord/lib/active_record/attribute_methods/dirty.rb | |
| parent | f326221c701e4f9d991e3eadcc793a73795fb218 (diff) | |
| parent | 7c51d1fcf9dc504c2dfd6e7184bbe8186f09819d (diff) | |
| download | rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.gz rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.bz2 rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/dirty.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/dirty.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index 439880c1fa..c19a33faa8 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/object/blank' module ActiveRecord @@ -88,7 +89,7 @@ module ActiveRecord end def clone_with_time_zone_conversion_attribute?(attr, old) - old.class.name == "Time" && time_zone_aware_attributes && !skip_time_zone_conversion_for_attributes.include?(attr.to_sym) + old.class.name == "Time" && time_zone_aware_attributes && !self.skip_time_zone_conversion_for_attributes.include?(attr.to_sym) end end end |