From b9a3b203b47f6d12b2c6983664ffaecbc5776dcb Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 25 Feb 2018 01:17:27 +0100 Subject: [PATCH] Fixed #350 Email encoding Removed utf8_decode(). Co-authored-by: shuhai --- src/psm/Util/Server/Updater/StatusNotifier.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/psm/Util/Server/Updater/StatusNotifier.php b/src/psm/Util/Server/Updater/StatusNotifier.php index ba11ad78..21f3c380 100644 --- a/src/psm/Util/Server/Updater/StatusNotifier.php +++ b/src/psm/Util/Server/Updater/StatusNotifier.php @@ -200,12 +200,12 @@ class StatusNotifier { protected function notifyByEmail($users) { // build mail object with some default values $mail = psm_build_mail(); - $mail->Subject = utf8_decode(psm_parse_msg($this->status_new, 'email_subject', $this->server)); + $mail->Subject = psm_parse_msg($this->status_new, 'email_subject', $this->server); $mail->Priority = 1; $body = psm_parse_msg($this->status_new, 'email_body', $this->server); - $mail->Body = utf8_decode($body); - $mail->AltBody = str_replace('
', "\n", $body); + $mail->Body = $body; + $mail->AltBody = str_replace('
', "\n", $body); if(psm_get_conf('log_email')) { $log_id = psm_add_log($this->server_id, 'email', $body); @@ -330,4 +330,4 @@ class StatusNotifier { "); return $users; } -} \ No newline at end of file +}