From f2f58f535520bfa77ab2d0ad1fb598f18349dd2e Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Wed, 27 May 2009 17:31:48 -0700 Subject: Fix failing ActionCacheFilter tests due to around filter changes. --- activesupport/lib/active_support/new_callbacks.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/new_callbacks.rb') 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) -- cgit v1.2.3