diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/session_management.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 76c0f38604..2e248e944b 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Allow ActionController::Base.session_store to lazily load the session class to allow for custom session store plugins. [Rick Olson] + * Make sure html_document is reset between integration test requests. [ctm] * Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError. [Josh Susser] diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb index 60b0cd5f94..95c5ea7336 100644 --- a/actionpack/lib/action_controller/session_management.rb +++ b/actionpack/lib/action_controller/session_management.rb @@ -18,13 +18,13 @@ module ActionController #:nodoc: # file system, but you can also specify one of the other included stores (:active_record_store, :drb_store, # :mem_cache_store, or :memory_store) or use your own class. def session_store=(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 + ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = store end # Returns the session store class currently used. def session_store - ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] + store = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] + self.session_store = store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store end # Returns the hash used to configure the session. Example use: |