[mms] Fix replying to non-UTF-8 messages when the 'reply_charset' pre…

…ference is true. Text is always stored internally in IMP_Compose as UTF-8, so sending the charset of the (yet-to-be converted) outgoing message to the DOM class was causing incorrect charset conversions. Conflicts: imp/docs/CHANGES imp/package.xml
horde · Aug 21, 2014 · 11c4e1a · 11c4e1a
1 parent a3f7679
commit 11c4e1a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -22,6 +22,8 @@ v6.3.0-git
 v6.2.2
 ------
 
+[mms] Fix replying to non-UTF-8 messages when the 'reply_charset' preference
+      is true.
 [jan] Fix vCard MIME viewer.
 [jan] Fix MIME viewer form actions in basic view (Bug #12677).
 [mms] Don't store/retrieve message history data if the Message-ID is

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -1439,7 +1439,6 @@ protected function _createMimeMessage(
                 $body,
                 'Xss',
                 array(
-                    'charset' => $this->charset,
                     'return_dom' => true,
                     'strip_style_attributes' => false
                 )

diff --git a/imp/package.xml b/imp/package.xml
@@ -3725,6 +3725,7 @@
    <date>2014-08-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Fix replying to non-UTF-8 messages when the &apos;reply_charset&apos; preference is true.
 * [jan] Fix vCard MIME viewer.
 * [jan] Fix MIME viewer form actions in basic view (Bug #12677).
 * [mms] Don&apos;t store/retrieve message history data if the Message-ID is missing/invalid.