Fixed User's findByUsernameOrEmail method.

maddoger · Nov 5, 2015 · 6792d1d · 6792d1d
1 parent d023705
commit 6792d1d
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/common/models/User.php b/common/models/User.php
@@ -373,17 +373,12 @@ public static function findByEmail($email, $checkStatus = true)
      */
     public static function findByUsernameOrEmail($username, $checkStatus = true)
     {
-        return static::findOne(
-            $checkStatus ?
-            [
-                'and',
-                ['or', 'username' => $username, 'email' => $username],
-                'status' => self::STATUS_ACTIVE
-            ] :
-            [
-                ['or', 'username' => $username, 'email' => $username],
-            ]
-        );
+        $query = static::find();
+        $query->where(['or', ['username' => $username], ['email' => $username]]);
+        if ($checkStatus) {
+            $query->andWhere(['status' => self::STATUS_ACTIVE]);
+        }
+        return $query->limit(1)->one();
     }
 
     /**