From 3815e050e0e0ddafb919741426f3c36ebdadb9a8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 03 Dec 2009 04:54:38 -0500
Subject: [PATCH] - Fix displaying nested message parts (#1486246)
---
program/include/rcube_message.php | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 1a22427..0b6fbb1 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -350,14 +350,13 @@
else if (($primary_type == 'text' && ($secondary_type == 'plain' || $secondary_type == 'html') && $mail_part->disposition != 'attachment') ||
($primary_type == 'message' && ($secondary_type == 'delivery-status' || $secondary_type == 'disposition-notification'))) {
- // add text part if we're not in alternative mode or if it matches the prefs
- if (!$this->parse_alternative ||
- ($secondary_type == 'html' && $this->opt['prefer_html']) ||
+ // add text part if it matches the prefs
+ if (($secondary_type == 'html' && $this->opt['prefer_html']) ||
($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
$mail_part->type = 'content';
$this->parts[] = $mail_part;
}
-
+
// list as attachment as well
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
--
Gitblit v1.9.1