kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Back out of 3109 for now as it seems to interfere with the flash

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3150 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-11-21 16:59:25 +00:00
parent baad1c4cdc
commit d345b7a4f0
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
actionpack/lib/action_controller/cgi_process.rb
View file

@ -93,7 +93,7 @@ module ActionController #:nodoc:
def session
unless @session
if @session_options == false
@session = disabled_session_hash
@session = Hash.new
else
stale_session_check! do
if session_options_with_string_keys['new_session'] == true
@ -121,17 +121,13 @@ module ActionController #:nodoc:
# Delete an old session if it exists then create a new one.
def new_session
if @session_options == false
disabled_session_hash
Hash.new
else
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => false)).delete rescue nil
CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
end
end
def disabled_session_hash
Hash.new { |h,k| raise "You disabled sessions but are attempting to set session[#{k.inspect}]" }
end
def stale_session_check!
yield
rescue ArgumentError => argument_error