diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-06-12 19:52:33 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-06-12 19:52:33 -0500 |
| commit | 6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354 (patch) | |
| tree | 3285bde79403e99cdf773f5a3d8467a59b0ed648 /actionpack/lib/action_controller | |
| parent | a3caf28da3a22c1326d3d98dcf71483a8edaa55a (diff) | |
| download | rails-6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354.tar.gz rails-6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354.tar.bz2 rails-6573f6a4bc1c2ebd26e0b4b3ef9fe1cde3219354.zip | |
Revert "Lazy load cache and session stores"
This reverts commit 19895f087c338d8385dff9d272d30fb87cb10330.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/session_management.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb index ad1013b379..80a3ddd2c5 100644 --- a/actionpack/lib/action_controller/session_management.rb +++ b/actionpack/lib/action_controller/session_management.rb @@ -1,3 +1,10 @@ +require 'action_controller/session/cookie_store' +require 'action_controller/session/drb_store' +require 'action_controller/session/mem_cache_store' +if Object.const_defined?(:ActiveRecord) + require 'action_controller/session/active_record_store' +end + module ActionController #:nodoc: module SessionManagement #:nodoc: def self.included(base) @@ -15,8 +22,6 @@ module ActionController #:nodoc: # <tt>:p_store</tt>, <tt>:drb_store</tt>, <tt>:mem_cache_store</tt>, or # <tt>:memory_store</tt>) or your own custom class. def session_store=(store) - require "action_controller/session/#{store.to_s}" if [:active_record_store, :drb_store, :mem_cache_store].include?(store) - ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store end |