X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnickname.php;fp=lib%2Fnickname.php;h=4d3795e392231fe5a8bd9966f8f28f504dd847c7;hb=80e2f4f529cac935d69dfb42a5bfdef82aa00dad;hp=562f1e2052897252558a309998ccb801e0a4d48a;hpb=63c95484bd658056f36b726f1751ad310a85f5b9;p=quix0rs-gnu-social.git

diff --git a/lib/nickname.php b/lib/nickname.php
index 562f1e2052..4d3795e392 100644
--- a/lib/nickname.php
+++ b/lib/nickname.php
@@ -103,15 +103,17 @@ class Nickname
      */
     public static function normalize($str)
     {
+        if (mb_strlen($str) > self::MAX_LEN) {
+            // Display forms must also fit!
+            throw new NicknameTooLongException();
+        }
+
         $str = trim($str);
         $str = str_replace('_', '', $str);
         $str = mb_strtolower($str);
 
-        $len = mb_strlen($str);
-        if ($len < 1) {
+        if (mb_strlen($str) < 1) {
             throw new NicknameEmptyException();
-        } else if ($len > self::MAX_LEN) {
-            throw new NicknameTooLongException();
         }
         if (!self::isCanonical($str)) {
             throw new NicknameInvalidException();