Merge branch 'master' into member-deleted

ppy · Dec 18, 2024 · fdd884c · fdd884c
2 parents 65e1fe9 + fc60d2d
commit fdd884c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2128,8 +2128,10 @@ public static function attemptLogin($user, $password, $ip = null)
 
     public static function findForLogin($username, $allowEmail = false)
     {
-        if (!present($username)) {
-            return;
+        $username = trim($username ?? '');
+
+        if ($username === null) {
+            return null;
         }
 
         $query = static::where('username', $username);