diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-14 08:47:42 -0800 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2012-09-21 15:36:23 +0300 |
| commit | b8fba557e139830cbc180bc11dbf92990f53edc5 (patch) | |
| tree | e2a8c1966ef8650d609c0740e67d67ed5a444386 /activerecord/lib/active_record/base.rb | |
| parent | 98f80218d4a588bd4bcace2ae534b9a791d381f9 (diff) | |
| download | rails-b8fba557e139830cbc180bc11dbf92990f53edc5.tar.gz rails-b8fba557e139830cbc180bc11dbf92990f53edc5.tar.bz2 rails-b8fba557e139830cbc180bc11dbf92990f53edc5.zip | |
Merge pull request #3544 from amatsuda/_field_changed
Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:
activerecord/lib/active_record/core.rb
activerecord/test/cases/dirty_test.rb
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rw-r--r-- | 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 b51bb5cc5e..7760736608 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -544,7 +544,7 @@ module ActiveRecord #:nodoc: @changed_attributes = {} self.class.column_defaults.each do |attr, orig_value| - @changed_attributes[attr] = orig_value if field_changed?(attr, orig_value, @attributes[attr]) + @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr]) end @aggregation_cache = {} |