Permalink
Browse files

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

  • Loading branch information...
2 parents 4b86107 + 56cb6fd commit 6e4201c98ae99d9274c17a85365227d4c4070525 @DorianGray DorianGray committed Jan 31, 2012
Showing with 4 additions and 3 deletions.
  1. +4 −3 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;
- $session->Data[\Models\Session::FIELD_USER] = $user;
+ $user->Password = null;
+ $session->Data[\Models\Session::FIELD_USER] = (array)$user;
}
}
}
@@ -63,3 +63,4 @@ protected function setHTTPStatusCode($code)
}
}
?>
+

0 comments on commit 6e4201c

Please sign in to comment.