diff options
| author | gbuesing <gbuesing@gmail.com> | 2008-04-20 21:57:56 -0500 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-04-20 21:57:56 -0500 |
| commit | 6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1 (patch) | |
| tree | 54a76b1698a9012d5b37c3ee13d258c9a03beaa6 /actionpack/lib/action_controller/caching | |
| parent | 32b82e4c6f5523cdf5ee78c3022c50b46e018351 (diff) | |
| parent | 1d18651ea36e2ba274b6c2e0fd4edd425e028589 (diff) | |
| download | rails-6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1.tar.gz rails-6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1.tar.bz2 rails-6ef4239f8bd4d4ea7a5bc7f2cdaf14f87e6eb9a1.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 5 |
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? |