diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-24 11:20:43 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-26 20:02:43 -0300 |
| commit | 5ad9a8e874db9e210123fde7a542cd2a05c6abd3 (patch) | |
| tree | d263715ed9c9fe1af20850209ce29b002ab150bf /actionpack | |
| parent | 47db156d4273fbc79d20b7461e8419e13a796445 (diff) | |
| download | rails-5ad9a8e874db9e210123fde7a542cd2a05c6abd3.tar.gz rails-5ad9a8e874db9e210123fde7a542cd2a05c6abd3.tar.bz2 rails-5ad9a8e874db9e210123fde7a542cd2a05c6abd3.zip | |
Return the same session data object when setting session id
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 3 |
1 files changed, 2 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..a4866f5a8f 100644 --- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb @@ -59,7 +59,8 @@ module ActionDispatch end def set_session(env, sid, session_data, options) - session_data.merge("session_id" => sid) + session_data["session_id"] = sid + session_data end def set_cookie(env, session_id, cookie) |