diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 5ec106eb8e..8a6892a3ed 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Subclasses of ActionController::Caching::Sweeper should be Reloadable. [Rick Olson] + * Document the :xhr option for verifications. #3666 [leeo] * Added :only and :except controls to skip_before/after_filter just like for when you add filters [DHH] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 3f54e5d383..df25fed3b2 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -521,9 +521,10 @@ module ActionController #:nodoc: class Sweeper < ActiveRecord::Observer #:nodoc: attr_accessor :controller - # ActiveRecord::Observer will mark this class as reloadable even though it should be + # ActiveRecord::Observer will mark this class as reloadable even though it should not be. + # However, subclasses of ActionController::Caching::Sweeper should be Reloadable def self.included_modules - super() - [ Reloadable ] + self == Sweeper ? super() - [ Reloadable ] : super() end def before(controller) |