Add html_charset to be APP_CHARSET

Merge remote-tracking branch 'origin/bug/741768'
eventum · Oct 18, 2015 · 0615268 · 0615268
2 parents 60653c8 + bcbde9a
commit 0615268
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,9 +5,10 @@ Eventum Issue Tracking System
 -------------------------
 - Fix few Static & Deprecated calls (Craig Pinfold, #72)
 - Use randomlib for private key generation, add UI to regenerate it (Elan Ruusamäe, #73)
-- Fix misplaced {if} in preferences template. (Robbert-Jan Roos, LP#1506279)
+- Fix misplaced {if} in preferences template (Robbert-Jan Roos, LP#1506279)
 - Auth and Project cookie related internal refactor (Elan Ruusamäe, #74)
 - Set limit 20 retries to try to send one mail (Elan Ruusamäe)
+- Add html_charset to be APP_CHARSET (Elan Ruusamäe, LP#741768)
 
 2015-10-13, Version 3.0.3
 -------------------------

diff --git a/lib/eventum/class.mail_helper.php b/lib/eventum/class.mail_helper.php
@@ -546,7 +546,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),
@@ -586,7 +591,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,