aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-04 16:59:54 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-04 16:59:54 -0800
commit3438373f038cefda664b879f49eec8aec6a15a76 (patch)
tree78b0c2c31e4a1eb99d2c62fa66a8fccf5fb1ad6f /actionpack/lib/action_controller/caching.rb
parentff29606c061099f82668ab62e50660cda8645512 (diff)
downloadrails-3438373f038cefda664b879f49eec8aec6a15a76.tar.gz
rails-3438373f038cefda664b879f49eec8aec6a15a76.tar.bz2
rails-3438373f038cefda664b879f49eec8aec6a15a76.zip
Use AS::Concern for caching modules
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 7fae4e924d..b3fa129929 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -57,13 +57,12 @@ module ActionController #:nodoc:
end
include ConfigMethods
+ include Pages, Actions, Fragments
+ include Sweeping if defined?(ActiveRecord)
included do
extend ConfigMethods
- include Pages, Actions, Fragments
- include Sweeping if defined?(ActiveRecord)
-
@@perform_caching = true
cattr_accessor :perform_caching
end