diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-11-21 16:59:25 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-11-21 16:59:25 +0000 |
| commit | d345b7a4f0b9fb957afa9fc1fcff0a50321a553d (patch) | |
| tree | 0de6d268dfc06ab0931fbdb755ce40282179753d | |
| parent | baad1c4cdce95b167f5b0a8329f853e58d6430a2 (diff) | |
| download | rails-d345b7a4f0b9fb957afa9fc1fcff0a50321a553d.tar.gz rails-d345b7a4f0b9fb957afa9fc1fcff0a50321a553d.tar.bz2 rails-d345b7a4f0b9fb957afa9fc1fcff0a50321a553d.zip | |
Back out of 3109 for now as it seems to interfere with the flash
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3150 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index c0cbc22edd..812899b327 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -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 |