From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 14 Oct 2010 12:25:17 +0000 (+0200)
Subject: Better fix for flagset+perms issue.
X-Git-Tag: xorg/1.0.1~49
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=81b0f4ed8def6d1eec3187552b906de05ce04df0;p=platal.git

Better fix for flagset+perms issue.

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

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 12d06e2..f46107c 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -208,8 +208,7 @@ class XorgSession extends PlSession
         }
 
         // Loads uid and hruid into the session for developement conveniance.
-        $_SESSION = array_merge($_SESSION, array('uid' => $user->id(), 'hruid' => $user->hruid, 'token' => $user->token));
-        unset($_SESSION['perms']);
+        $_SESSION = array_merge($_SESSION, array('uid' => $user->id(), 'hruid' => $user->hruid, 'token' => $user->token, 'user' => $user));
 
         // Starts the session's logger, and sets up the permanent cookie.
         if (S::suid()) {