aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-02-09 00:35:10 -0500
committerGodfrey Chan <godfreykfc@gmail.com>2014-02-11 01:54:17 -0800
commita668beffd64106a1e1fedb71cc25eaaa11baf0c1 (patch)
tree50ba1891d81f6cb7b281a3591ac0a51b69780cab /actionpack
parenta6ce984b49519de7701aa13d04300c9d03cf8f72 (diff)
downloadrails-a668beffd64106a1e1fedb71cc25eaaa11baf0c1.tar.gz
rails-a668beffd64106a1e1fedb71cc25eaaa11baf0c1.tar.bz2
rails-a668beffd64106a1e1fedb71cc25eaaa11baf0c1.zip
Stringify the incoming hash in FlashHash
Stringify the incoming as well to handle incoming symbol keys from marshalled sessions
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/middleware/flash.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 419bcb8a73..1e45a38e5f 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/keys'
+
module ActionDispatch
class Request < Rack::Request
# Access the contents of the flash. Use <tt>flash["notice"]</tt> to
@@ -94,7 +96,7 @@ module ActionDispatch
def initialize(flashes = {}, discard = []) #:nodoc:
@discard = Set.new(stringify_array(discard))
- @flashes = flashes
+ @flashes = flashes.stringify_keys
@now = nil
end