aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/request.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-06-25 09:36:26 +0200
committerJosé Valim <jose.valim@gmail.com>2010-06-25 09:36:26 +0200
commita12b76b09e98493c1e4aee147416ae5999402298 (patch)
treee32982afd1ab84335b03bd23f46ef48e99909ba0 /actionpack/lib/action_dispatch/http/request.rb
parent6682cce0386811ffe3e6d31fc025ede0936d86c3 (diff)
downloadrails-a12b76b09e98493c1e4aee147416ae5999402298.tar.gz
rails-a12b76b09e98493c1e4aee147416ae5999402298.tar.bz2
rails-a12b76b09e98493c1e4aee147416ae5999402298.zip
Just reading flash messages should not create a session if one does not exist yet.
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/request.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 6b611823d0..fd23b1df79 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -194,9 +194,12 @@ module ActionDispatch
@env['rack.input']
end
+ # TODO This should be broken apart into AD::Request::Session and probably
+ # be included by the session middleware.
def reset_session
session.destroy if session
self.session = {}
+ @env['action_dispatch.request.flash_hash'] = nil
end
def session=(session) #:nodoc: