aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching/actions.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-04-21 03:38:16 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-04-21 03:45:38 +0100
commit2b69840e5efba885c8ec6281d5b8a56fcabff283 (patch)
tree6535bda8b27784e097a0fe44cf692e150e3ad2bb /actionpack/lib/action_controller/caching/actions.rb
parentcaa03a5c870c6a03a35f6dcfaf040a6d689eaee2 (diff)
downloadrails-2b69840e5efba885c8ec6281d5b8a56fcabff283.tar.gz
rails-2b69840e5efba885c8ec6281d5b8a56fcabff283.tar.bz2
rails-2b69840e5efba885c8ec6281d5b8a56fcabff283.zip
Remove ActionController::Base#view_controller_internals
Get rid of ActionController::Base#view_controller_internals flag and use @@protected_view_variables for storing the list of controller specific instance variables which should be inaccessible inside views.
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index 4410e47eb3..7b0551c664 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -41,7 +41,6 @@ module ActionController #:nodoc:
base.extend(ClassMethods)
base.class_eval do
attr_accessor :rendered_action_cache, :action_cache_path
- alias_method_chain :protected_instance_variables, :action_caching
end
end
@@ -55,10 +54,6 @@ module ActionController #:nodoc:
end
protected
- def protected_instance_variables_with_action_caching
- protected_instance_variables_without_action_caching + %w(@action_cache_path)
- end
-
def expire_action(options = {})
return unless cache_configured?