Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-23 19:02:46 +01:00
Code Issues Releases Wiki Activity

Improve decoding strings in Webklex/laravel-imap library

Browse Source
This commit is contained in:
FreeScout 2023-06-26 11:33:57 -07:00
parent 9312036f69
commit 47ebc2f694
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overrides/webklex/laravel-imap/src/IMAP/Message.php
View File

@ -876,7 +876,7 @@ class Message
// }
// Try iconv.
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7' && $from != 'iso-2022-jp-ms') {
try {
$result = iconv($from, $to.'//IGNORE', $str);
} catch (\Exception $e) {

2
overrides/webklex/php-imap/src/Message.php
View File

@ -730,7 +730,7 @@ class Message {
}
// Try iconv.
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7' && $from != 'iso-2022-jp-ms') {
try {
$result = iconv($from, $to.'//IGNORE', $str);
} catch (\Exception $e) {