fix setting getting active userid

diff --git a/lib/user.php b/lib/user.php
index cebae2493f3a187789a51ad3e8c1ba67a25b5cdb..efae4f9aa3665de4bc21c40c9067cfc8c93cab9d 100644 (file)
--- a/lib/user.php
+++ b/lib/user.php
@@ -220,8 +220,7 @@ class OC_User {
         * @brief Sets user id for session and triggers emit
         */
        public static function setUserId($uid) {
-               $user = self::getManager()->get($uid);
-               self::getUserSession()->setUser($user);
+               OC::$session->set('user_id', $uid);
        }
 
        /**
@@ -297,9 +296,9 @@ class OC_User {
         * @return string uid or false
         */
        public static function getUser() {
-               $user = self::getUserSession()->getUser();
-               if ($user) {
-                       return $user->getUID();
+               $uid = OC::$session->get('user_id');
+               if (!is_null($uid)) {
+                       return $uid;
                } else {
                        return false;
                }