callbacks that return false should cause save to return false

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5226 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index af2645eeb7..5d7c30caf9 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1765,8 +1765,8 @@ module ActiveRecord #:nodoc:
     private
       def create_or_update
         raise ReadOnlyRecord if readonly?
-        if new_record? then create else update end
-        true
+        result = new_record? ? create : update
+        result != false
       end
 
       # Updates the associated record with values matching those of the instance attributes.