Merge pull request rails#6804 from acapilleri/firm_changes_from_zero_…

…to_string changed the firm of changes_from_zero_to_string?
flyerhzm · Jun 21, 2012 · e76ced0 · e76ced0
2 parents 682d247 + c3a5be0
commit e76ced0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -78,7 +78,7 @@ def update(*)
       def _field_changed?(attr, old, value)
         if column = column_for_attribute(attr)
           if column.number? && (changes_from_nil_to_empty_string?(column, old, value) ||
-                                changes_from_zero_to_string?(column, old, value))
+                                changes_from_zero_to_string?(old, value))
             value = nil
           else
             value = column.type_cast(value)
@@ -96,7 +96,7 @@ def changes_from_nil_to_empty_string?(column, old, value)
         column.null && (old.nil? || old == 0) && value.blank?
       end
 
-      def changes_from_zero_to_string?(column, old, value)
+      def changes_from_zero_to_string?(old, value)
         # For columns with old 0 and value non-empty string
         old == 0 && value.present? && value != '0'
       end