public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/josh/rails.git
apply [5833] to 1.2 RC branch

git-svn-id: 
http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5834 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
technoweenie (author)
Thu Jan 04 13:19:42 -0800 2007
commit  622d70a11eb3e110682803509822e2bfb8a9d8bb
tree    0f996307c7eae8d2f5a5df13dec1dd4556734c90
parent  c26cca3f458b07b144af15fb9ec9ad2b3319be5e
...
1
2
 
 
3
4
5
...
1
2
3
4
5
6
7
0
@@ -1,5 +1,7 @@
0
 *1.13.0 RC2*
0
 
0
+* Allow ActionController::Base.session_store to lazily load the session class to allow for custom session store plugins. [Rick Olson]
0
+
0
 * Make sure html_document is reset between integration test requests. [ctm]
0
 
0
 * 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]
...
18
19
20
21
22
 
23
24
25
26
27
 
 
28
29
30
...
18
19
20
 
 
21
22
23
24
25
 
26
27
28
29
30
0
@@ -18,13 +18,13 @@ module ActionController #:nodoc:
0
       # file system, but you can also specify one of the other included stores (:active_record_store, :drb_store,
0
       # :mem_cache_store, or :memory_store) or use your own class.
0
       def session_store=(store)
0
- ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
0
- store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
0
+ ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = store
0
       end
0
 
0
       # Returns the session store class currently used.
0
       def session_store
0
- ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
0
+ store = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
0
+ self.session_store = store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
0
       end
0
 
0
       # Returns the hash used to configure the session. Example use:

Comments

    No one has commented yet.