ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #858 from franzliedke/patch-14

Browse Source 
[Auth] Eloquent driver does now allow login via object
This commit is contained in:
Taylor Otwell
2012-09-01 16:58:57 -07:00
parent 46f68ab78c 0f5de55d5b
commit 5b14091e3f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
laravel/auth/drivers/eloquent.php
View File

@@ -7,14 +7,20 @@ class Eloquent extends Driver {
* *
* If the user is a guest, null should be returned. * If the user is a guest, null should be returned.
* *
* @param int $id * @param int|object $token
* @return mixed|null * @return mixed|null
*/ */
public function retrieve($id) public function retrieve($token)
{ {
if (filter_var($id, FILTER_VALIDATE_INT) !== false) // We return an object here either if the passed token is an integer (ID)
// or if we are passed a model object of the correct type
if (filter_var($token, FILTER_VALIDATE_INT) !== false)
{ {
return $this->model()->find($id); return $this->model()->find($token);
}
else if (get_class($token) == Config::get('auth.model'))
{
return $token;
} }
} }