Permalink
Browse files

Merge pull request #5599 from carlosantoniodasilva/fix-build-3-1

Fix build for branch 3-1-stable - return the same session hash object
  • Loading branch information...
2 parents dafded2 + a16aa8c commit 4590e9915e99df6b6105063925d8da5fb669caff @tenderlove tenderlove committed Mar 26, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 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 4590e99

Please sign in to comment.