diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:14:05 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:14:05 -0700 |
| commit | 8fdf3d7890d2e58508e028c93d3797f21a774dbc (patch) | |
| tree | 4eff185e19bd63161ad15fb47120f53e93debcf5 /actionpack/lib/action_controller/caching/actions.rb | |
| parent | 251a6e492c72d8aea713b7dabd245d68301e455d (diff) | |
| download | rails-8fdf3d7890d2e58508e028c93d3797f21a774dbc.tar.gz rails-8fdf3d7890d2e58508e028c93d3797f21a774dbc.tar.bz2 rails-8fdf3d7890d2e58508e028c93d3797f21a774dbc.zip | |
Remove some defined?(Http) checks
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 54148b55d8..4420678df6 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 |