aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorSantiago Pastorino and Carl Lerche <santiago+carl@wyeworks.com>2010-04-15 16:58:54 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2010-04-15 18:25:08 -0300
commit0ea434e2f4083368fe9657aae9ceb5c484336f14 (patch)
tree0b665d482b792621fd8c7675b053d763fa6cc47c /actionpack/lib/action_controller/caching.rb
parent005c2bac46051581e5af826a183c66185022772d (diff)
downloadrails-0ea434e2f4083368fe9657aae9ceb5c484336f14.tar.gz
rails-0ea434e2f4083368fe9657aae9ceb5c484336f14.tar.bz2
rails-0ea434e2f4083368fe9657aae9ceb5c484336f14.zip
Make perform_caching work again, with the tests passing and backward compatible
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 3489d94ec9..b3fa129929 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -52,7 +52,7 @@ module ActionController #:nodoc:
private
def cache_configured?
- config.perform_caching && cache_store
+ perform_caching && cache_store
end
end