From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 1 Oct 2006 12:16:33 +0000 (+0000)
Subject: fix #472
X-Git-Tag: xorg/0.9.11~29
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f6d157e7a3f11263ff1ce8f46625b9c83afef9fb;p=platal.git

fix #472



git-svn-id: svn+ssh://murphy/home/svn/platal/branches/platal-0.9.11@936 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php
index d674fa4..b57b2d1 100644
--- a/include/xorg/session.inc.php
+++ b/include/xorg/session.inc.php
@@ -230,7 +230,7 @@ function start_connexion ($uid, $identified)
         setcookie('ORGuid', $uid, (time()+25920000), '/', '', 0);
     }
 
-    $_SESSION         = $sess;
+    $_SESSION         = array_merge($_SESSION, $sess);
     $_SESSION['log']  = $logger;
     $_SESSION['auth'] = ($identified ? AUTH_MDP : AUTH_COOKIE);
     set_skin();