diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-09-01 23:42:39 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-09-01 23:42:39 -0700 |
| commit | abd47c15b870ea3cdbe610a02df03e9425870417 (patch) | |
| tree | ec0156814aeaa7f5dbec041af5955467d7ffc73d /actionpack/lib/action_dispatch/http/request.rb | |
| parent | a6674991037fc360c7a72e7c28eec448f0231a3e (diff) | |
| parent | 8bfcb0de3a2599925ce714cddc49d608ff8e03a8 (diff) | |
| download | rails-abd47c15b870ea3cdbe610a02df03e9425870417.tar.gz rails-abd47c15b870ea3cdbe610a02df03e9425870417.tar.bz2 rails-abd47c15b870ea3cdbe610a02df03e9425870417.zip | |
Merge pull request #7495 from steveklabnik/issue_7478
Properly reset the session on reset_session
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index d24c7c7f3f..b8ebeb408f 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -227,8 +227,11 @@ module ActionDispatch # 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 && session.respond_to?(:destroy) - self.session = {} + if session && session.respond_to?(:destroy) + session.destroy + else + self.session = {} + end @env['action_dispatch.request.flash_hash'] = nil end |