Fix showing quote blocks in message part popup view

horde · Jan 29, 2014 · fa0be92 · fa0be92
1 parent a7484b5
commit fa0be92
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/imp/lib/Mime/Viewer/Plain.php b/imp/lib/Mime/Viewer/Plain.php
@@ -130,19 +130,19 @@ protected function _impRender($inline)
 
         // Highlight quoted parts of an email.
         if ($prefs->getValue('highlight_text')) {
-            if ($registry->getView() == $registry::VIEW_SMARTMOBILE) {
-                $hideBlocks = $js_blocks = false;
-            } else {
+            $hideBlocks = $js_blocks = false;
+            if ($registry->getView() !== $registry::VIEW_SMARTMOBILE) {
                 $js_blocks = $inline;
-                $show = $prefs->getValue('show_quoteblocks');
-                $hideBlocks = $inline &&
-                    (($show == 'hidden') ||
-                     (($show == 'thread') && ($injector->getInstance('Horde_Variables')->page == 'thread')));
-                if (!$hideBlocks &&
-                    in_array($show, array('list', 'listthread'))) {
-                    $header = $this->getConfigParam('imp_contents')->getHeader();
-                    $list_info = $injector->getInstance('IMP_Message_Ui')->getListInformation($header);
-                    $hideBlocks = $list_info['exists'];
+                if ($inline) {
+                    $show = $prefs->getValue('show_quoteblocks');
+                    $hideBlocks = (($show == 'hidden') ||
+                                   (($show == 'thread') && ($injector->getInstance('Horde_Variables')->page == 'thread')));
+                    if (!$hideBlocks &&
+                        in_array($show, array('list', 'listthread'))) {
+                        $header = $this->getConfigParam('imp_contents')->getHeader();
+                        $list_info = $injector->getInstance('IMP_Message_Ui')->getListInformation($header);
+                        $hideBlocks = $list_info['exists'];
+                    }
                 }
             }