Ensure headers are always UTF-8.

Possible fix for Bug #13456
horde · Sep 2, 2014 · 9e00a3b · 9e00a3b
1 parent 0688cd5
commit 9e00a3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php b/framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php
@@ -150,7 +150,7 @@ public function addStandardHeaders()
             $updated = true;
         }
         if ($updated) {
-            $this->_header_text = $headers->toString();
+            $this->_header_text = $headers->toString(array('charset' => 'UTF-8'));
         }
     }
 

diff --git a/framework/Core/lib/Horde/Core/ActiveSync/Mail.php b/framework/Core/lib/Horde/Core/ActiveSync/Mail.php
@@ -279,7 +279,7 @@ protected function _sendRaw()
     protected function _sendSmart()
     {
         $mime_message = $this->_raw->getMimeObject();
-        $mail = new Horde_Mime_Mail($this->_headers->toArray());
+        $mail = new Horde_Mime_Mail($this->_headers->toArray(array('charset' => 'UTF-8')));
         try {
             $this->_getImapMessage();
         } catch (Horde_Exception_NotFound $e) {