kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net] 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2004-12-21 10:47:02 +00:00
parent 506fd8ea57
commit 1eb751a021
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net]
* Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey)
* 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
View File

@ -92,7 +92,7 @@ module ActionController #:nodoc:
private
def new_session
CGI::Session.new(@cgi, DEFAULT_SESSION_OPTIONS.merge(@session_options).merge("new_session" => true))
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
end
def session_options_with_string_keys