aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-01 02:58:22 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-01 02:58:22 +0000
commit15da1cf2caf16052513b0fc51e8e59b9ef408522 (patch)
treef0ab1f4c5143d5bf7be69c9ecbde9f0c64339ee2 /actionpack/lib/action_controller
parent2504982945828d24c9b799c408d71576508b4c15 (diff)
downloadrails-15da1cf2caf16052513b0fc51e8e59b9ef408522.tar.gz
rails-15da1cf2caf16052513b0fc51e8e59b9ef408522.tar.bz2
rails-15da1cf2caf16052513b0fc51e8e59b9ef408522.zip
Dont mark Sweepers as reloadables
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/caching.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 724c9cea0d..099df53cf6 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -521,6 +521,11 @@ module ActionController #:nodoc:
class Sweeper < ActiveRecord::Observer #:nodoc:
attr_accessor :controller
+ # ActiveRecord::Observer will mark this class as reloadable even though it should be
+ def self.included_modules(include_super = true)
+ super - [ Reloadable ]
+ end
+
def before(controller)
self.controller = controller
callback(:before)