diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-05-19 07:34:52 -0700 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-05-19 07:34:52 -0700 |
| commit | 4cf4c7f4543f31d88793a4c9ead30161b7263bf2 (patch) | |
| tree | 2f4a92ec8495def0d2082df96beff8a97ef38d0e /actionpack/lib | |
| parent | 95bd19911a62fe7dbe8e72c08e29902efdcfce85 (diff) | |
| parent | 2d50887b2437aaee2b051b06367bedfb9949eedf (diff) | |
| download | rails-4cf4c7f4543f31d88793a4c9ead30161b7263bf2.tar.gz rails-4cf4c7f4543f31d88793a4c9ead30161b7263bf2.tar.bz2 rails-4cf4c7f4543f31d88793a4c9ead30161b7263bf2.zip | |
Merge pull request #1150 from stevenbristol/master
The cookie jar does not to_s cookie names (keys)
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 24ebb8fed7..0057f64dd3 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -167,8 +167,8 @@ module ActionDispatch handle_options(options) - @set_cookies[key] = options - @delete_cookies.delete(key) + @set_cookies[key.to_s] = options + @delete_cookies.delete(key.to_s) value end @@ -181,7 +181,7 @@ module ActionDispatch handle_options(options) value = @cookies.delete(key.to_s) - @delete_cookies[key] = options + @delete_cookies[key.to_s] = options value end |