Fix session init when the user have no last connection.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php
index 0075c28..0f05e15 100644 (file)
--- a/include/xorg/session.inc.php
+++ b/include/xorg/session.inc.php
@@ -255,7 +255,9 @@ function start_connexion ($uid, $identified)
                         WHERE  s.uid = {?} AND s.suid = 0
                      ORDER BY  s.start DESC
                         LIMIT  1", $uid);
-    $sess = array_merge($sess, $res->fetchOneAssoc());
+    if ($res->numRows()) {
+        $sess = array_merge($sess, $res->fetchOneAssoc());
+    }
     $suid = S::v('suid');
 
     if ($suid) {

diff --git a/modules/admin.php b/modules/admin.php
index 9327f8a..7bbe5e7 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -382,7 +382,7 @@ class AdminModule extends PLModule
             $_SESSION['suid'] = $_SESSION;
             $r = XDB::query("SELECT id FROM aliases WHERE alias={?}", $login);
             if($uid = $r->fetchOneCell()) {
-                start_connexion($uid,true);
+                start_connexion($uid, true);
                 pl_redirect("");
             }
         }