diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-05 18:48:10 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-05 18:48:10 +0000 |
| commit | 9d7e6432b22a11e96ad7a3cab7510fac7b3927d6 (patch) | |
| tree | e2d4d84550401d00a6e0dbe0b38fc6ae475803f5 /activerecord/lib/active_record/callbacks.rb | |
| parent | d48322ecca83765a47c054aa72a7165efe9a81f5 (diff) | |
| download | rails-9d7e6432b22a11e96ad7a3cab7510fac7b3927d6.tar.gz rails-9d7e6432b22a11e96ad7a3cab7510fac7b3927d6.tar.bz2 rails-9d7e6432b22a11e96ad7a3cab7510fac7b3927d6.zip | |
Deprecated ActiveRecord::Base.new_record? in favor of ActiveRecord::Base.new? (old version still works until Rails 2.0) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5017 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 bfe96fd2ed..dd92a03111 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_record? then result = callback(:before_validation_on_create) else result = callback(:before_validation_on_update) end + if new? 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_record? then callback(:after_validation_on_create) else callback(:after_validation_on_update) end + if new? then callback(:after_validation_on_create) else callback(:after_validation_on_update) end return result end |