diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-05-06 15:05:25 -0500 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-05-06 15:12:31 -0500 |
commit | bf876aa0b61995f1be9b0146df7db74bd34d46af (patch) | |
tree | e4db393cf484b05b0940e38396b82b1e596dc268 /actionpack/lib | |
parent | de8f3cb483e5821dc02e674c9ef176fc9159da26 (diff) | |
download | rails-bf876aa0b61995f1be9b0146df7db74bd34d46af.tar.gz rails-bf876aa0b61995f1be9b0146df7db74bd34d46af.tar.bz2 rails-bf876aa0b61995f1be9b0146df7db74bd34d46af.zip |
Make flash messages cookie compatible with Rails 4
In #18721 we removed the discard key from the session hash used to flash
messages and that broke compatibility with Rails 4 applications because they
try to map in the discarded flash messages and it returns nil.
Fixes #24726.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index 06038af571..80703940ed 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -133,7 +133,7 @@ module ActionDispatch def to_session_value #:nodoc: flashes_to_keep = @flashes.except(*@discard) return nil if flashes_to_keep.empty? - {'flashes' => flashes_to_keep} + { 'discard' => [], 'flashes' => flashes_to_keep } end def initialize(flashes = {}, discard = []) #:nodoc: |