diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-05 18:54:24 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-05 18:54:24 +0000 |
| commit | 85fbb22f071b96d5a20ac71dc16d4432c08cdcf3 (patch) | |
| tree | 4b8482edbaf0c2e598735a14b919a40315f1252b /activerecord/lib/active_record/callbacks.rb | |
| parent | 9d7e6432b22a11e96ad7a3cab7510fac7b3927d6 (diff) | |
| download | rails-85fbb22f071b96d5a20ac71dc16d4432c08cdcf3.tar.gz rails-85fbb22f071b96d5a20ac71dc16d4432c08cdcf3.tar.bz2 rails-85fbb22f071b96d5a20ac71dc16d4432c08cdcf3.zip | |
Backed out of new_record? to new? transformation as it would screw up existing models that did boolean calls on "new" attributes [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5018 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/callbacks.rb')
| -rwxr-xr-x | activerecord/lib/active_record/callbacks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index dd92a03111..bfe96fd2ed 100755 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -293,13 +293,13 @@ module ActiveRecord def valid_with_callbacks? #:nodoc: return false if callback(:before_validation) == false - if new? then result = callback(:before_validation_on_create) else result = callback(:before_validation_on_update) end + if new_record? then result = callback(:before_validation_on_create) else result = callback(:before_validation_on_update) end return false if result == false result = valid_without_callbacks? callback(:after_validation) - if new? then callback(:after_validation_on_create) else callback(:after_validation_on_update) end + if new_record? then callback(:after_validation_on_create) else callback(:after_validation_on_update) end return result end |