Merge branch 'hotfix/auth_login_eloquent_driver' into develop

laravel/auth/drivers/driver.php

@@ -5,7 +5,6 @@ use Laravel\Cookie;
 use Laravel\Config;
 use Laravel\Session;
 use Laravel\Crypter;
-use Laravel\Database\Eloquent\Model as Eloquent;
 
 abstract class Driver {
 
@@ -107,10 +106,6 @@ abstract class Driver {
 	 */
 	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->get_key();
-
 		$this->token = $token;
 
 		$this->store($token);

laravel/auth/drivers/eloquent.php

@@ -43,6 +43,29 @@ class Eloquent extends Driver {
 		return false;
 	}
 
+	/**
+	 * Login the user assigned to the given token.
+	 *
+	 * The token is typically a numeric ID for the user.
+	 *
+	 * @param  mixed   $token
+	 * @param  bool    $remember
+	 * @return bool
+	 */
+	public function login($token, $remember = false)
+	{
+		// if the token is an Eloquent model get the primary key
+		if ($token instanceof \Eloquent) $token = $token->get_key();
+
+		$this->token = $token;
+
+		$this->store($token);
+
+		if ($remember) $this->remember($token);
+
+		return true;
+	}
+
 	/**
 	 * Get a fresh model instance.
 	 *