From bcbde9a56818b09e7f9b762c5a60aa7005d1d57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 16 Oct 2014 22:52:47 +0300 Subject: [PATCH] add html_charset => APP_CHARSET. LP#741768 --- lib/eventum/class.mail_helper.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/eventum/class.mail_helper.php b/lib/eventum/class.mail_helper.php index 775e4b820a..7e91d92f32 100644 --- a/lib/eventum/class.mail_helper.php +++ b/lib/eventum/class.mail_helper.php @@ -532,7 +532,12 @@ public function send($from, $to, $subject, $save_email_copy = 0, $issue_id = fal $to = Mime_Helper::encodeAddress($to); $subject = Mime_Helper::encode($subject); - $body = $this->mime->get(array('text_charset' => APP_CHARSET, 'head_charset' => APP_CHARSET, 'text_encoding' => APP_EMAIL_ENCODING)); + $body = $this->mime->get(array( + 'text_charset' => APP_CHARSET, + 'html_charset' => APP_CHARSET, + 'head_charset' => APP_CHARSET, + 'text_encoding' => APP_EMAIL_ENCODING, + )); $headers = array( 'From' => $from, 'To' => self::fixAddressQuoting($to), @@ -572,7 +577,12 @@ public function getFullHeaders($from, $to, $subject) $to = Mime_Helper::encodeAddress($to); $subject = Mime_Helper::encode($subject); - $body = $this->mime->get(array('text_charset' => APP_CHARSET, 'head_charset' => APP_CHARSET, 'text_encoding' => APP_EMAIL_ENCODING)); + $body = $this->mime->get(array( + 'text_charset' => APP_CHARSET, + 'html_charset' => APP_CHARSET, + 'head_charset' => APP_CHARSET, + 'text_encoding' => APP_EMAIL_ENCODING, + )); $this->setHeaders(array( 'From' => $from, 'To' => $to,