diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-06-23 18:13:46 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-06-23 18:13:46 -0300 |
commit | b9088dce07f8525cdb84a1312a77b81db79067d6 (patch) | |
tree | 72ace069842b074981ba814ef1c335271176ce27 /actionpack/lib/action_controller/caching/actions.rb | |
parent | 4864f92ee34e840307d968fa8b04972b6d786fe8 (diff) | |
parent | 4417a19b035d73eb46a5e06e296a4b1c8091bef1 (diff) | |
download | rails-b9088dce07f8525cdb84a1312a77b81db79067d6.tar.gz rails-b9088dce07f8525cdb84a1312a77b81db79067d6.tar.bz2 rails-b9088dce07f8525cdb84a1312a77b81db79067d6.zip |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
-rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 54148b55d8..d8a1662acc 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -62,14 +62,7 @@ module ActionController #:nodoc: cache_filter = ActionCacheFilter.new(:layout => options.delete(:layout), :cache_path => options.delete(:cache_path), :store_options => options) - # TODO: Remove this once new base is swapped in. - if defined?(ActionController::Http) - around_filter cache_filter, filter_options - else - around_filter(filter_options) do |controller, action| - cache_filter.filter(controller, action) - end - end + around_filter cache_filter, filter_options end end @@ -91,19 +84,10 @@ module ActionController #:nodoc: @options = options end - # TODO: Remove once New Base is merged - if defined?(ActionController::Http) - def filter(controller) - should_continue = before(controller) - yield if should_continue - after(controller) - end - else - def filter(controller, action) - should_continue = before(controller) - action.call if should_continue - after(controller) - end + def filter(controller) + should_continue = before(controller) + yield if should_continue + after(controller) end def before(controller) |