fix #472
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sun, 1 Oct 2006 12:16:33 +0000 (12:16 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Sun, 1 Oct 2006 12:16:33 +0000 (12:16 +0000)
git-svn-id: svn+ssh://murphy/home/svn/platal/branches/platal-0.9.11@936 839d8a87-29fc-0310-9880-83ba4fa771e5

include/xorg/session.inc.php

index d674fa4..b57b2d1 100644 (file)
@@ -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();