diff options
| author | Sam Stephenson <sam@37signals.com> | 2006-02-01 20:25:27 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2006-02-01 20:25:27 +0000 |
| commit | 49401f880c716aceb0f23051c10bcbd59ed89574 (patch) | |
| tree | 36d690729ff19e928cbc35ed69d83e6c07a2a01e /actionpack/lib | |
| parent | f791fe76211dde0b583fdb1b1b634eaf969eaf85 (diff) | |
| download | rails-49401f880c716aceb0f23051c10bcbd59ed89574.tar.gz rails-49401f880c716aceb0f23051c10bcbd59ed89574.tar.bz2 rails-49401f880c716aceb0f23051c10bcbd59ed89574.zip | |
Subclasses of ActionController::Caching::Sweeper should be Reloadable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3517 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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) |