Skip to content
Browse files

Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2

Fix build for branch 3-2-stable - return the same session hash object
  • Loading branch information...
2 parents 3f1b8c6 + 907bcce commit 0e916ae232e7c9ffed614a55bbb0218557d944ea @josevalim josevalim committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
View
2 actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -59,7 +59,7 @@ def unpacked_cookie_data(env)
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)

0 comments on commit 0e916ae

Please sign in to comment.
Something went wrong with that request. Please try again.