From 7674ad0547292059134711708eb3068150f47054 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 10 Nov 2007 18:54:43 +0100 Subject: [PATCH] Fix session init when the user have no last connection. Signed-off-by: Florent Bruneau --- include/xorg/session.inc.php | 4 +++- modules/admin.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index 3dccb92..3e368e4 100644 --- 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 7b97b37..7451c63 100644 --- 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(""); } } -- 2.1.4