X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnickname.php;h=6e638c21b74039a3316532271493b060af5dab68;hb=dd8e17a3874aa99063b62b51e9a637a5abb0b923;hp=5a5b515b4dfceec44f70c3f4b63c7e7b7285ef98;hpb=b9a11f8c216499bf0cb6a93ea04e688c96bb3923;p=quix0rs-gnu-social.git

diff --git a/lib/nickname.php b/lib/nickname.php
index 5a5b515b4d..6e638c21b7 100644
--- a/lib/nickname.php
+++ b/lib/nickname.php
@@ -126,15 +126,17 @@ class Nickname
      */
     public static function normalize($str, $checkuse=false)
     {
+        if (mb_strlen($str) > self::MAX_LEN) {
+            // Display forms must also fit!
+            throw new NicknameTooLongException();
+        }
+
         // We should also have UTF-8 normalization (Ã¥ to a etc.)
         $str = trim($str);
         $str = str_replace('_', '', $str);
         $str = mb_strtolower($str);
 
-        if (mb_strlen($str) > self::MAX_LEN) {
-            // Display forms must also fit!
-            throw new NicknameTooLongException();
-        } elseif (mb_strlen($str) < 1) {
+        if (mb_strlen($str) < 1) {
             throw new NicknameEmptyException();
         } elseif (!self::isCanonical($str)) {
             throw new NicknameInvalidException();
@@ -172,6 +174,8 @@ class Nickname
      public static function isBlacklisted($str)
      {
          $blacklist = common_config('nickname', 'blacklist');
+         if(!$blacklist)
+         	return false;
          return in_array($str, $blacklist);
      }