Permalink
Browse files

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]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8990 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent e117350 commit 363a6f5de6b8625d2d671623625bcb55b7a793b9 @dhh dhh committed Mar 8, 2008
Showing with 4 additions and 3 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +2 −3 actionpack/lib/action_controller/caching/sweeping.rb
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* 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]
+
* Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]
* Better error message for type conflicts when parsing params. Closes #7962 [spicycode, matt]
View
5 actionpack/lib/action_controller/caching/sweeping.rb
@@ -36,7 +36,6 @@ def self.included(base) #:nodoc:
module ClassMethods #:nodoc:
def cache_sweeper(*sweepers)
- return unless perform_caching
configuration = sweepers.extract_options!
sweepers.each do |sweeper|
@@ -59,11 +58,11 @@ class Sweeper < ActiveRecord::Observer #:nodoc:
def before(controller)
self.controller = controller
- callback(:before)
+ callback(:before) if controller.perform_caching
end
def after(controller)
- callback(:after)
+ callback(:after) if controller.perform_caching
# Clean up, so that the controller can be collected after this request
self.controller = nil
end

0 comments on commit 363a6f5

Please sign in to comment.