X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fxorgsession.php;h=7789318edd91b8aa18009ffb180da8a6ea8c5320;hb=c4b6b1f4989e57e80aa721028d8255a3800442f9;hp=4bb2d16511ba97de0a46ee901d8ef5b0f600d94c;hpb=e7ffcfd4e56316c1b22db06dc64a5ade6bec8f8a;p=platal.git diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 4bb2d16..7789318 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -197,7 +197,7 @@ class XorgSession extends PlSession $res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name, a.sex = 'female' AS femme, a.email_format, a.token, FIND_IN_SET('watch', a.flags) AS watch_account, - UNIX_TIMESTAMP(fp.last_seen) AS banana_last, UNIX_TIMESTAMP(w.last) AS watch_last, + UNIX_TIMESTAMP(fp.last_seen) AS banana_last, a.last_version, g.g_account_name IS NOT NULL AS googleapps, UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, a.is_admin, at.perms @@ -312,11 +312,7 @@ class XorgSession extends PlSession { require_once 'notifs.inc.php'; $user = S::user(); - $date = null; - if (S::has('watch_last')) { - $date = S::i('watch_last'); - } - $n = Watch::getCount($user, $date); + $n = Watch::getCount($user); S::set('notifs', $n); }