diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-03-21 14:01:06 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-03-21 14:01:06 -0300 |
| commit | d5977c67bdd6a459e21328cb8c0cf2cf47ccc185 (patch) | |
| tree | c986d3456b411e75e96a047529778908ff3123b7 /actionpack/lib/action_dispatch | |
| parent | dda31d59a03adb7e5aa372e72bb66a3886632f2f (diff) | |
| parent | 6c6a22176f01b563a7b731fee9f37c837ba83320 (diff) | |
| download | rails-d5977c67bdd6a459e21328cb8c0cf2cf47ccc185.tar.gz rails-d5977c67bdd6a459e21328cb8c0cf2cf47ccc185.tar.bz2 rails-d5977c67bdd6a459e21328cb8c0cf2cf47ccc185.zip | |
Merge pull request #24229 from maclover7/fix-24222
Fix request.reset_session for API controllers
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 316a9f08b7..b0ed681623 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -337,7 +337,6 @@ module ActionDispatch else self.session = {} end - self.flash = nil end def session=(session) #:nodoc: diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index c51dcd542a..06038af571 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -70,6 +70,11 @@ module ActionDispatch session.delete('flash') end end + + def reset_session # :nodoc + super + self.flash = nil + end end class FlashNow #:nodoc: |