diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:23:11 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:23:11 -0700 |
| commit | 55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53 (patch) | |
| tree | feb3f10381724dd41389b604d51dc42080098a60 /actionpack/lib/action_controller/caching | |
| parent | 8fdf3d7890d2e58508e028c93d3797f21a774dbc (diff) | |
| download | rails-55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53.tar.gz rails-55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53.tar.bz2 rails-55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53.zip | |
Cleaning up if defined?(ActionController::Http) blocks from the pre new base era.
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 4420678df6..d8a1662acc 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -84,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) |