Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* code for task #2616.

Browse Source
This commit is contained in:
wangyidong
2016-06-07 13:59:03 +08:00
parent b986c959e2
commit 78ce4d3aeb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mail/model.php
+6 -2
View File
@@ -304,8 +304,12 @@ class mailModel extends model
catch (phpmailerException $e)
{
$mailError = ob_get_contents();
$encoding = mb_detect_encoding($mailError, array("ASCII",'UTF-8',"GB2312","GBK",'BIG5'));
$this->errors[] = nl2br(trim(strip_tags($e->errorMessage()))) . '<br />' . mb_convert_encoding($mailError, 'utf8', $encoding);
if(extension_loaded('mbstring'))
{
$encoding = mb_detect_encoding($mailError, array('ASCII','UTF-8','GB2312','GBK','BIG5'));
if($encoding != 'UTF-8') $mailError = mb_convert_encoding($mailError, 'utf8', $encoding);
}
$this->errors[] = nl2br(trim(strip_tags($e->errorMessage()))) . '<br />' . $mailError;
}
catch (Exception $e)
{