hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!320 发送邮件时，邮件服务商返回的错误信息编码导致系统500错误 

Merge pull request !320 from Henry/email_revision
pull/320/MERGE
F4nniu 2021-06-17 03:23:01 +00:00 committed by Gitee
parent c615eda2dc e0b008097a
commit 44fd7d14ec
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/common/library/Email.php
View File

@ -219,6 +219,7 @@ class Email
preg_match_all("/Expected: (\d+)\, Got: (\d+)( \| (.*))?\$/i", $e->getMessage(), $matches); preg_match_all("/Expected: (\d+)\, Got: (\d+)( \| (.*))?\$/i", $e->getMessage(), $matches);
$code = isset($matches[2][3]) ? $matches[2][3] : 0; $code = isset($matches[2][3]) ? $matches[2][3] : 0;
$message = isset($matches[2][0]) ? $matches[4][0] : $e->getMessage(); $message = isset($matches[2][0]) ? $matches[4][0] : $e->getMessage();
$message = mb_convert_encoding($message, 'UTF-8', 'GBK,GB2312,BIG5');
$this->setError($message); $this->setError($message);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->setError($e->getMessage()); $this->setError($e->getMessage());