Skip to content
This repository
Browse code

Fixed regression with Base#reset_session that wouldn't use the the DE…

…FAULT_SESSION_OPTIONS [adam@the-kramers.net]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 1eb751a021c9b3d3fd74165583252e4a53322b58 1 parent 506fd8e
David Heinemeier Hansson authored December 21, 2004
2  actionpack/CHANGELOG
... ...
@@ -1,5 +1,7 @@
1 1
 *SVN*
2 2
 
  3
+* Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net]
  4
+
3 5
 * Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey)
4 6
 
5 7
 * Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 [Ulysses]
2  actionpack/lib/action_controller/cgi_process.rb
@@ -92,7 +92,7 @@ def method_missing(method_id, *arguments)
92 92
 
93 93
     private
94 94
       def new_session
95  
-        CGI::Session.new(@cgi, DEFAULT_SESSION_OPTIONS.merge(@session_options).merge("new_session" => true))
  95
+        CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
96 96
       end
97 97
       
98 98
       def session_options_with_string_keys

0 notes on commit 1eb751a

Please sign in to comment.
Something went wrong with that request. Please try again.