diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index b1d402cd30..59639a010e 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -83,9 +83,15 @@ module ActionDispatch case value when FlashHash # Rails 3.1, 3.2 flashes = value.instance_variable_get(:@flashes) + if discard = value.instance_variable_get(:@used) + flashes.except!(*discard) + end new(flashes, flashes.keys) when Hash # Rails 4.0 flashes = value['flashes'] + if discard = value['discard'] + flashes.except!(*discard) + end new(flashes, flashes.keys) else new |