aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorBogdan Gusiev <agresso@gmail.com>2012-09-07 14:42:31 +0300
committerBogdan Gusiev <agresso@gmail.com>2012-09-07 14:42:31 +0300
commit6777f7b75d1d10ff148e3d72cef3ef642de5bda3 (patch)
treee9c074fc4a993978e8ba31ce4b47843f41b0549c /actionpack/lib
parente20a790b9e63ff7ff71753b24bd88c0a62dc2cf7 (diff)
downloadrails-6777f7b75d1d10ff148e3d72cef3ef642de5bda3.tar.gz
rails-6777f7b75d1d10ff148e3d72cef3ef642de5bda3.tar.bz2
rails-6777f7b75d1d10ff148e3d72cef3ef642de5bda3.zip
AS::Callbacks: deprecate monkey patch of object callbacks
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index 0238135bc1..eb3aa05a25 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -132,7 +132,7 @@ module ActionController #:nodoc:
options.values_at(:cache_path, :store_options, :layout)
end
- def filter(controller)
+ def around(controller)
cache_layout = @cache_layout.respond_to?(:call) ? @cache_layout.call(controller) : @cache_layout
path_options = if @cache_path.respond_to?(:call)