aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/new_callbacks.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/new_callbacks.rb')
-rw-r--r--activesupport/lib/active_support/new_callbacks.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb
index 185fb6a6af..f1d2ea7bb1 100644
--- a/activesupport/lib/active_support/new_callbacks.rb
+++ b/activesupport/lib/active_support/new_callbacks.rb
@@ -313,8 +313,8 @@ module ActiveSupport
#{method_name}_object.send("filter", self, &blk)
# TODO: Deprecate this
elsif #{method_name}_object.respond_to?(:before) && #{method_name}_object.respond_to?(:after)
- #{method_name}_object.before(self)
- yield
+ should_continue = #{method_name}_object.before(self)
+ yield if should_continue
#{method_name}_object.after(self)
else
#{method_name}_object.send("#{kind}_#{name}", self, &blk)