diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-04-18 13:04:04 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-04-18 13:04:04 -0700 |
| commit | eb83c9cf42aa208371643cdb10a2cbb8373e60ac (patch) | |
| tree | b75c0cdce2f9186b6935ec16897194c6d232ee59 /actionpack/lib/action_controller | |
| parent | d32a4cbaa5174cc1a73d41a73f55145251c18c84 (diff) | |
| parent | 978c80d6e347b060dc11ee666c8a3a61fc9408a4 (diff) | |
| download | rails-eb83c9cf42aa208371643cdb10a2cbb8373e60ac.tar.gz rails-eb83c9cf42aa208371643cdb10a2cbb8373e60ac.tar.bz2 rails-eb83c9cf42aa208371643cdb10a2cbb8373e60ac.zip | |
Merge remote branch 'spastorino/master'
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 5 |
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 |