Merge branch 'feature/eloquent_model_detection' into staging

laravel/auth/drivers/driver.php

@@ -107,10 +107,6 @@ abstract public function attempt($arguments = array());
 	 */
 	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

@@ -15,7 +15,30 @@ public function retrieve($id)
 		if (filter_var($id, FILTER_VALIDATE_INT) !== false)
 		{
 			return $this->model()->find($id);
-		} 
+		}
+	}
+
+	/**
+	 * 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;
 	}
 
 	/**