From 7a43a05a2b236123329be3198c149c8e894b0450 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Thu, 2 Feb 2006 04:54:07 +0000 Subject: Further improvements to reloading code git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 4 ++-- actionpack/lib/action_controller/session/active_record_store.rb | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index df25fed3b2..e62fe11a19 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -523,8 +523,8 @@ module ActionController #:nodoc: # 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 - self == Sweeper ? super() - [ Reloadable ] : super() + def self.reloadable? #:nodoc: + self != Sweeper end def before(controller) diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb index 02384021d8..7642320747 100644 --- a/actionpack/lib/action_controller/session/active_record_store.rb +++ b/actionpack/lib/action_controller/session/active_record_store.rb @@ -65,11 +65,6 @@ class CGI before_save :raise_on_session_data_overflow! class << self - # Don't try to reload ARStore::Session in dev mode. - def included_modules - super() - [ Reloadable ] - end - # Don't try to reload ARStore::Session in dev mode. def reloadable? #:nodoc: false -- cgit v1.2.3