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

Fix build for branch 3-2-stable - return the same session hash object
This commit is contained in:
José Valim
2012-03-26 14:11:55 -07:00

View File

@@ -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)