summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-22 08:31:54 +0200
committerAleksander Machniak <alec@alec.pl>2012-10-22 08:31:54 +0200
commit05a580a11775f0cf157f29cb7f26ae18ed60cb08 (patch)
tree90d734a51d906f40f2c19a114172bd9ec0ef24ea /program
parent374104ed6d00fa899fae043c345861b40354b8b3 (diff)
Fix HTML part detection in messages with attachments (#1488769)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_message.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 4e1b5a0c2..d15cc7577 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -218,7 +218,18 @@ class rcube_message
// HTML part can be on the lower level, if not...
if (count($level) > 1) {
// It can be an alternative or related message part
- $parent = $this->mime_parts[0];
+ // find parent part
+ $parent = null;
+ foreach ($this->mime_parts as $part) {
+ if ($part->mime_id == $level[0]) {
+ $parent = $part;
+ }
+ }
+
+ if (!$parent) {
+ continue;
+ }
+
if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
continue;
}