diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-26 14:11:55 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-26 14:11:55 -0700 |
| commit | 0e916ae232e7c9ffed614a55bbb0218557d944ea (patch) | |
| tree | a44737c63724db27676960d7cea5cde1bf7d8cb2 /actionpack | |
| parent | 3f1b8c6a95fcdcdc14ecd0f6fe1758a1e1044269 (diff) | |
| parent | 907bcce9a005002739d6c71a5123b65c2f0ed183 (diff) | |
| download | rails-0e916ae232e7c9ffed614a55bbb0218557d944ea.tar.gz rails-0e916ae232e7c9ffed614a55bbb0218557d944ea.tar.bz2 rails-0e916ae232e7c9ffed614a55bbb0218557d944ea.zip | |
Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable - return the same session hash object
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb index 8ebf870b95..29e9e6c261 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb @@ -59,7 +59,7 @@ module ActionDispatch end def set_session(env, sid, session_data, options) - session_data.merge("session_id" => sid) + session_data.merge!("session_id" => sid) end def set_cookie(env, session_id, cookie) |