Fix the check for creds vs ident columns

This prevents the breaking change that was implemented with #220
Zizaco · Mar 12, 2014 · 060e6ef · 060e6ef
1 parent ae50ba7
commit 060e6ef
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Zizaco/Confide/ConfideEloquentRepository.php b/src/Zizaco/Confide/ConfideEloquentRepository.php
@@ -108,10 +108,14 @@ public function getUserByIdentity( $credentials, $identityColumns = array('email
         $user = $this->model();
 
         $first = true;
+        $hasWhere = false;
+
         foreach ($identityColumns as $attribute) {
 
             if(isset($credentials[$attribute]))
             {
+                $hasWhere = true;
+
                 if($first)
                 {
                     $user = $user->where($attribute, $credentials[$attribute]);        
@@ -124,12 +128,15 @@ public function getUserByIdentity( $credentials, $identityColumns = array('email
             }            
             else
             {
-                return null;
+                continue;
             }
         }
 
-        $user = $user->get();
-
+        if($hasWhere)
+	    {
+		    $user = $user->get();
+	    }
+
         if(! empty($user)) {
             return $user->first();
         }