Bug #8415 - Merge from FW_3: ignore compose_html pref in mimp view

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index 789a1cf..28ae622 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2533,6 +2533,8 @@ OLD MIMP CHANGELOG
 v1.1.2
 ------
 
+[mms] Ignore 'compose_html' preference in IMP (Bug #8415) (Requires IMP 4.3.5).
+[mms] Fix showing Cc and Bcc fields (Bug #8167).
 [cjh] Implement custom menu items (Bug #7630).
 
 

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index b0fd3c0..e3dc3e0 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1310,7 +1310,7 @@ class IMP_Compose
             $msg_post = '';
         }
 
-        $compose_html = $GLOBALS['prefs']->getValue('compose_html');
+        $compose_html = (($_SESSION['imp']['view'] != 'mimp') && $GLOBALS['prefs']->getValue('compose_html'));
 
         $msg_text = $this->_getMessageText($contents, array(
             'html' => ($GLOBALS['prefs']->getValue('reply_format') || $compose_html),
@@ -1396,7 +1396,7 @@ class IMP_Compose
                 " -----\n" . $this->_getMsgHeaders($h) . "\n";
             $msg_post = "\n\n----- " . _("End forwarded message") . " -----\n";
 
-            $compose_html = $GLOBALS['prefs']->getValue('compose_html');
+            $compose_html = (($_SESSION['imp']['view'] != 'mimp') && $GLOBALS['prefs']->getValue('compose_html'));
 
             $msg_text = $this->_getMessageText($contents, array(
                 'html' => ($GLOBALS['prefs']->getValue('reply_format') || $compose_html),