Merge commit 'origin/fusionax' into account

[platal.git] / classes / xorgsession.php

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 589d0d8..ab54814 100644 (file)
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -180,8 +180,7 @@ class XorgSession extends PlSession
 
     protected function startSessionAs($user, $level)
     {
-        $session_user = S::v('user');
-        if ((!is_null($session_user) && $session_user->id() != $user->id())
+        if ((!is_null(S::user()) && S::user()->id() != $user->id())
             || (S::has('uid') && S::i('uid') != $user->id())) {
             return false;
         } else if (S::has('uid')) {
@@ -207,8 +206,8 @@ class XorgSession extends PlSession
                         INNER JOIN  watch           AS w  ON(w.uid = a.uid)
                          LEFT JOIN  forum_profiles  AS fp ON(fp.uid = a.uid)
                          LEFT JOIN  gapps_accounts  AS g  ON(a.uid = g.l_userid AND g.g_status = 'active')
-                         LEFT JOIN  logger.last_sessions AS ls ON (ls.uid = a.uid)
-                         LEFT JOIN  logger.sessions AS s  ON(s.id = ls.id)
+                         LEFT JOIN  #logger#.last_sessions AS ls ON (ls.uid = a.uid)
+                         LEFT JOIN  #logger#.sessions AS s  ON(s.id = ls.id)
                              WHERE  a.uid = {?} AND a.state = 'active'", $user->id());
         if ($res->numRows() != 1) {
             return false;