From 47658a33eef8f2d0eed75a17cfc2bbf72e603937 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 3 Feb 2009 07:40:26 +0000 Subject: - Fix displaying of alternative-inside-alternative messages (#1485713) git-svn-id: https://svn.roundcube.net/trunk@2270 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/program/include/rcube_message.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index ca03af336..ea1af1dec 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail ---------- - Fix checking for recent messages on various IMAP servers (#1485702) - performance fix: Don't fetch quota and recent messages in "message view" mode +- Fix displaying of alternative-inside-alternative messages (#1485713) 2009/01/28 (alec) ---------- diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 8a2cb1703..fa2aebc5c 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -266,7 +266,7 @@ class rcube_message $html_part = $p; else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched') $enriched_part = $p; - else if ($sub_ctype_primary=='multipart' && ($sub_ctype_secondary=='related' || $sub_ctype_secondary=='mixed')) + else if ($sub_ctype_primary=='multipart' && in_array($sub_ctype_secondary, array('related', 'mixed', 'alternative'))) $related_part = $p; } -- cgit v1.2.3