From d5058de8feef7bcb9daa256b2502ccd58c74a184 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 7 Sep 2011 12:31:52 +0000 Subject: - Fix displaying multipart/alternative messages with only one part (#1487938) git-svn-id: https://svn.roundcube.net/trunk@5191 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/program/include/rcube_message.php | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 7a8973155..2009c7e93 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix displaying multipart/alternative messages with only one part (#1487938) - Rewritten messages caching: Indexes are stored in a separate table, so there's no need to store all messages in a folder Added threads data caching diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 2ec386c6b..af6c61c4f 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -299,8 +299,10 @@ class rcube_message $structure->type = 'content'; $this->parts[] = &$structure; } - // message contains alternative parts - else if ($mimetype == 'multipart/alternative' && is_array($structure->parts)) { + // message contains (more than one!) alternative parts + else if ($mimetype == 'multipart/alternative' + && is_array($structure->parts) && count($structure->parts) > 1 + ) { // get html/plaintext parts $plain_part = $html_part = $print_part = $related_part = null; -- cgit v1.2.3