Fix failing ActionCacheFilter tests due to around filter changes.

This commit is contained in:
Yehuda Katz + Carl Lerche 2009-05-27 17:31:48 -07:00
parent 1e2628431a
commit f2f58f5355
2 changed files with 3 additions and 3 deletions

View File

@ -93,7 +93,7 @@ module ActionController #:nodoc:
# TODO: Remove once New Base is merged
if defined?(ActionController::Http)
def around_process_action(controller)
def filter(controller)
should_continue = before(controller)
yield if should_continue
after(controller)

View File

@ -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)