Merge branch 'master' of github.com:Olivine-Labs/Mint

Olivine-Labs · Jan 31, 2012 · 6e4201c · 6e4201c
2 parents 4b86107 + 56cb6fd
commit 6e4201c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/Router/Handler.class.php b/core/Router/Handler.class.php
@@ -22,13 +22,13 @@ public function PreRequest()
   {
     $session = \Classes\SessionHandler::getSession();
 
-    if(!array_key_exists(\Models\Session::FIELD_USER, $session->Data) && array_key_exists("token", $this->_request)){
+    if(!array_key_exists(\Models\Session::FIELD_USER, $session->Data) && array_key_exists("_token", $this->_request)){
       $user = \Controllers\Users::GetByToken(trim($this->_request['_token']),trim($this->_request['_userid']));
 
       if($user !== null)
       {
-        $user->LoggedIn = true;
+        $user->Password = null;
-        $session->Data[\Models\Session::FIELD_USER] = $user;
+        $session->Data[\Models\Session::FIELD_USER] = (array)$user;
       }
     }
   }
@@ -63,3 +63,4 @@ protected function setHTTPStatusCode($code)
   }
 }
 ?>
+