From 5ad9a8e874db9e210123fde7a542cd2a05c6abd3 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 24 Mar 2012 11:20:43 -0300 Subject: Return the same session data object when setting session id --- actionpack/lib/action_dispatch/middleware/session/cookie_store.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib') 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) -- cgit v1.2.3