Merge branch 'fix-auth' into develop

278dbf7a · Shawn McCool · 548e73ac · 3c43f5fa · 278dbf7a
Commit 278dbf7a authored May 27, 2012 by Shawn McCool
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

driver.php laravel/auth/drivers/driver.php +1 -1

No files found.
--- a/laravel/auth/drivers/driver.php
+++ b/laravel/auth/drivers/driver.php
@@ -109,7 +109,7 @@ abstract class Driver {
 	{
 		// 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;