diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-22 12:00:13 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-22 12:00:13 +0200 |
| commit | 4163ccec2343ee66e2488f067eab2a15260e1219 (patch) | |
| tree | 70213bd4d187c88b2fd0bbf05a54eed7ec3a49f7 /actionpack/lib/action_controller/caching.rb | |
| parent | a8330c2006e90a6da8f621fdaf1156fa63b4049a (diff) | |
| download | rails-4163ccec2343ee66e2488f067eab2a15260e1219.tar.gz rails-4163ccec2343ee66e2488f067eab2a15260e1219.tar.bz2 rails-4163ccec2343ee66e2488f067eab2a15260e1219.zip | |
Clean up the config object in ActionPack. Create config_accessor which just delegates to the config object, reducing the number of deprecations and add specific tests.
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 0da0ca1893..4105f9e14f 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -63,12 +63,10 @@ module ActionController #:nodoc: included do extend ConfigMethods - delegate :perform_caching, :perform_caching=, :to => :config - singleton_class.delegate :perform_caching, :perform_caching=, :to => :config - self.perform_caching = true + config_accessor :perform_caching + self.perform_caching = true if perform_caching.nil? end - def caching_allowed? request.get? && response.status == 200 end |