diff options
| author | Samuel Cochran <sj26@sj26.com> | 2015-01-30 09:47:03 +1100 |
|---|---|---|
| committer | Samuel Cochran <sj26@sj26.com> | 2015-01-30 09:47:03 +1100 |
| commit | 3f528e371c9ac2cf8e240a29d500a18ab8f5439d (patch) | |
| tree | 84516b46c2bc3717e76992eba10f8b7eac102657 /actionpack/lib/action_dispatch/middleware | |
| parent | f7adb34999eb4df7916102b60f5aa3f0ddc8210c (diff) | |
| download | rails-3f528e371c9ac2cf8e240a29d500a18ab8f5439d.tar.gz rails-3f528e371c9ac2cf8e240a29d500a18ab8f5439d.tar.bz2 rails-3f528e371c9ac2cf8e240a29d500a18ab8f5439d.zip | |
Migrate old flash behaviour
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
| -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 |