aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-04-15 02:21:01 -0300
committerwycats <wycats@gmail.com>2010-04-14 22:35:13 -0700
commita618ad358a51beead39eca3bf3ee029b66f34f73 (patch)
tree36455d0b5515df6591aea1c4d4328d5535abfd11 /actionpack/lib/action_controller/caching.rb
parentfc22552e5f9abc9d5449f5b3c0d347e53d7d7575 (diff)
downloadrails-a618ad358a51beead39eca3bf3ee029b66f34f73.tar.gz
rails-a618ad358a51beead39eca3bf3ee029b66f34f73.tar.bz2
rails-a618ad358a51beead39eca3bf3ee029b66f34f73.zip
Make use of config.perform_caching
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 b3fa129929..3489d94ec9 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?
- perform_caching && cache_store
+ config.perform_caching && cache_store
end
end