Merge pull request #21 from DoobleD/develop

Fix error mb_convert_encoding(): Argument #3 ($from_encoding) contains invalid encoding "windows-1256"
Z-Hub · Sep 2, 2023 · d11bc98 · d11bc98
2 parents 339fe67 + 962a583
commit d11bc98
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/lib/utils/utils.php b/src/lib/utils/utils.php
@@ -1278,7 +1278,11 @@ private static function convertRawHeader2Utf8($nonencstr, $utf8str) {
                 $str .= $val->text;
             }
             else {
-                $str .= @mb_convert_encoding($val->text, "utf-8", $val->charset);
+                try {
+                    $str .= @mb_convert_encoding($val->text, "utf-8", $val->charset);
+                } catch (ValueError $exception) {
+                    $str .= @iconv($val->charset, "utf-8", $val->text);
+                }
             }
         }
         if (!$isiso2022jp) {