diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2010-06-30 23:01:30 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2010-06-30 23:01:30 +0100 |
| commit | d2c633ba0bfb7baacdee89a46d7d036d24c68817 (patch) | |
| tree | 8f0974852b51597652e6ae73da26f3eb80fe878b /actionpack/lib/action_dispatch/http/request.rb | |
| parent | 92c0f17d6d2a958d3a6285b0e5408e9e0e7122e1 (diff) | |
| parent | c63cf7bf0db708fe46a929cf57649ab5a92034af (diff) | |
| download | rails-d2c633ba0bfb7baacdee89a46d7d036d24c68817.tar.gz rails-d2c633ba0bfb7baacdee89a46d7d036d24c68817.tar.bz2 rails-d2c633ba0bfb7baacdee89a46d7d036d24c68817.zip | |
Merge branch 'master' of http://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rw-r--r--[-rwxr-xr-x] | actionpack/lib/action_dispatch/http/request.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 98f4f5ae18..fd23b1df79 100755..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 - self.session_options.delete(:id) + session.destroy if session self.session = {} + @env['action_dispatch.request.flash_hash'] = nil end def session=(session) #:nodoc: |