diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-05-12 14:37:18 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-05-12 14:37:18 -0700 |
| commit | 3a0e579b9dc0e36f37420f03a89c69480c6c2e64 (patch) | |
| tree | 0e13c8f14d9ebb1c1f8cae1dba4f35fe02099d48 /actionpack | |
| parent | 2519fb0e6d468b45e6d12157d436540c9ef080a0 (diff) | |
| parent | c43ca06ca091fc09e2c86bb051ac92b648f12b64 (diff) | |
| download | rails-3a0e579b9dc0e36f37420f03a89c69480c6c2e64.tar.gz rails-3a0e579b9dc0e36f37420f03a89c69480c6c2e64.tar.bz2 rails-3a0e579b9dc0e36f37420f03a89c69480c6c2e64.zip | |
Merge pull request #10580 from CodeTag/master
Code cleanup for ActionDispatch::Flash#call
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/flash.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb index 7e56feb90a..f8f9cf7c9f 100644 --- a/actionpack/lib/action_dispatch/middleware/flash.rb +++ b/actionpack/lib/action_dispatch/middleware/flash.rb @@ -243,15 +243,9 @@ module ActionDispatch session = Request::Session.find(env) || {} flash_hash = env[KEY] - if flash_hash - if !flash_hash.empty? || session.key?('flash') - session["flash"] = flash_hash.to_session_value - new_hash = flash_hash.dup - else - new_hash = flash_hash - end - - env[KEY] = new_hash + if flash_hash.present? || session.key?('flash') + session["flash"] = flash_hash.to_session_value + env[KEY] = flash_hash.dup end if (!session.respond_to?(:loaded?) || session.loaded?) && # (reset_session uses {}, which doesn't implement #loaded?) |