From 7a0e7c7270548138a333bc39aab5aec80580174b Mon Sep 17 00:00:00 2001 From: Michael Lovitt Date: Fri, 9 Jan 2009 18:09:50 -0500 Subject: Fixed broken after_save callback; was being called when before_create was canceled or before_update was canceled Signed-off-by: Michael Koziarski [#1735 state:committed] --- activerecord/lib/active_record/callbacks.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index 42bfe34505..9f5384d39a 100644 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -219,8 +219,9 @@ module ActiveRecord def after_save() end def create_or_update_with_callbacks #:nodoc: return false if callback(:before_save) == false - result = create_or_update_without_callbacks - callback(:after_save) + if result = create_or_update_without_callbacks + callback(:after_save) + end result end private :create_or_update_with_callbacks -- cgit v1.2.3