kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix failing ActionCacheFilter tests due to around filter changes.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/caching/actions.rb
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)

4
activesupport/lib/active_support/new_callbacks.rb
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)