eric/hesk-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚀 HESK v3.1.2

Browse Source 
Signed-off-by: Luke Tainton <luke@tainton.uk>
This commit is contained in:
Luke Tainton
2020-08-25 17:24:00 +01:00
parent 77512a09b4
commit 107839166a
171 changed files with 978 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hesk/inc/mail/email_parser.php
View File

@@ -289,7 +289,7 @@ function process_results($result,$tempdir)
// Convert to UTF-8 before processing further
if ($r["encoding"] != "" && $r["encoding"] != 'UTF-8')
{
$result["Data"] = $result["Data"] == "" ? "" : iconv($r["encoding"], 'UTF-8', $result["Data"]);
$result["Data"] = $result["Data"] == "" ? "" : (function_exists('iconv') ? iconv($r["encoding"], 'UTF-8', $result["Data"]) : utf8_encode($result["Data"]));
$r["encoding"] = 'UTF-8';
}