Browse Source

fix #758 后台设置邮件内容支持html

magicblack 4 years ago
parent
commit
b909c1557a
2 changed files with 2 additions and 0 deletions
  1. 1 0
      application/admin/controller/System.php
  2. 1 0
      application/common/model/User.php

+ 1 - 0
application/admin/controller/System.php

@@ -30,6 +30,7 @@ class System extends Base
         View::instance()->assign(['code'=>$code,'time'=>$GLOBALS['config']['email']['time']]);
         $title =  View::instance()->display($title);
         $msg =  View::instance()->display($msg);
+        $msg = htmlspecialchars_decode($msg);
         $res = mac_send_mail($to, $title, $msg, $conf);
         if ($res['code']==1) {
             return json(['code' => 1, 'msg' => lang('test_ok')]);

+ 1 - 0
application/common/model/User.php

@@ -677,6 +677,7 @@ class User extends Base
             View::instance()->assign(['code'=>$code,'time'=>$GLOBALS['config']['email']['time']]);
             $title =  View::instance()->display($title);
             $msg =  View::instance()->display($msg);
+            $msg = htmlspecialchars_decode($msg);
             $res_send = mac_send_mail($to, $title, $msg);
             $res_code = $res_send['code'];
             $res_msg = $res_send['msg'];