0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Fixed that sweepers defined by cache_sweeper will be added regardless of the perform_caching setting. Instead, control whether the sweeper should be run with the perform_caching setting. This makes testing easier when you want to turn perform_caching on/off [DHH]
0
+
0
 * Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]
0
 
0
 * Better error message for type conflicts when parsing params.  Closes #7962 [spicycode, matt]

0
@@ -36,7 +36,6 @@ module ActionController #:nodoc:
0
 
0
       module ClassMethods #:nodoc:
0
         def cache_sweeper(*sweepers)
0
-          return unless perform_caching
0
           configuration = sweepers.extract_options!
0
 
0
           sweepers.each do |sweeper|
0
@@ -59,11 +58,11 @@ module ActionController #:nodoc:
0
 
0
         def before(controller)
0
           self.controller = controller
0
-          callback(:before)
0
+          callback(:before) if controller.perform_caching
0
         end
0
 
0
         def after(controller)
0
-          callback(:after)
0
+          callback(:after) if controller.perform_caching
0
           # Clean up, so that the controller can be collected after this request
0
           self.controller = nil
0
         end