Merge branch 'fix-auth' into staging

2012-05-27 20:29:33 +02:00 · 2012-05-27 20:29:33 +02:00 · 988dae2488
parent ffa9c7997a 3c43f5fac4
commit 988dae2488
1 changed files with 1 additions and 1 deletions
--- a/laravel/auth/drivers/driver.php
+++ b/laravel/auth/drivers/driver.php
@ -109,7 +109,7 @@ public function login($token, $remember = false)
 	{
 		// if the token is an Eloquent model
 		// set the token from the id field
-		if ($token instanceof Eloquent) $token = $token->id;
+		if ($token instanceof Eloquent) $token = $token->get_key();

 		$this->token = $token;