aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-04-17 19:08:49 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2010-04-17 23:40:03 -0300
commit4309c1fda3d778b16569b74a7d86ec19b5e994a3 (patch)
tree2d8146ad1c415d847e0b00023bdc8059e91f73f2 /actionpack
parent8c7e8976e97d96f514e22b04fc1afb9453134076 (diff)
downloadrails-4309c1fda3d778b16569b74a7d86ec19b5e994a3.tar.gz
rails-4309c1fda3d778b16569b74a7d86ec19b5e994a3.tar.bz2
rails-4309c1fda3d778b16569b74a7d86ec19b5e994a3.zip
perform_caching is now delegated to config on instance and class level
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/caching.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index b3fa129929..0da0ca1893 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -63,8 +63,9 @@ module ActionController #:nodoc:
included do
extend ConfigMethods
- @@perform_caching = true
- cattr_accessor :perform_caching
+ delegate :perform_caching, :perform_caching=, :to => :config
+ singleton_class.delegate :perform_caching, :perform_caching=, :to => :config
+ self.perform_caching = true
end