RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2025-02-06 02:39:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from u-mulder/mb-func-suppress-fix

Browse Source 
Вместо подавления ошибки в mb_string-функциях ловим выпадающий эксепшен
This commit is contained in:
Alexey 2023-03-06 17:59:01 +03:00 committed by GitHub
commit 848792c24a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Fetch/Message.php
View File

@ -599,11 +599,18 @@ class Message
}
$converted = null;
if (!$converted && function_exists('mb_convert_encoding') && @mb_check_encoding($text, $from)) {
$converted = @mb_convert_encoding($text, $to, $from);
if (!$converted && function_exists('mb_convert_encoding')) {
try {
if (mb_check_encoding($text, $from)) {
$converted = mb_convert_encoding($text, $to, $from);
}
} catch (\ValueError $e) {
// noop
}
}
if (!$converted && function_exists('iconv')) {
// Для `iconv` @ пока работает
$converted = @iconv($from, $to . self::$charsetFlag, $text);
}