Only show text/plain if show_html_default=0

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3414 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 88fdaf90fce5e0dc1255b75a6dfed1b3f2644db5..9e8aba7d62ef665b523030f14f3b98c242201c45 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -45,7 +45,11 @@ $subject = trim(decodeHeader($rfc822_header->subject));
 $cc = decodeHeader($rfc822_header->getAddr_s('cc'));
 $to = decodeHeader($rfc822_header->getAddr_s('to'));
 
-$ent_ar = $message->findDisplayEntity();
+if ($show_html_default == 1) {
+    $ent_ar = $message->findDisplayEntity(array());
+} else {
+    $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+}
 $body = '';
 if ($ent_ar[0] != '') {
   for ($i = 0; $i < count($ent_ar); $i++) {