Explorar o código

!320 发送邮件时,邮件服务商返回的错误信息编码导致系统500错误
Merge pull request !320 from Henry/email_revision

F4nniu %!s(int64=3) %!d(string=hai) anos
pai
achega
44fd7d14ec
Modificáronse 1 ficheiros con 1 adicións e 0 borrados
  1. 1 0
      application/common/library/Email.php

+ 1 - 0
application/common/library/Email.php

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