diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-03 09:54:38 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-03 09:54:38 +0000 |
| commit | 957c08b10238e8c7f3c5eaee841272aa98a8b139 (patch) | |
| tree | fbf970314013708404297342ec43d800768135bd | |
| parent | 20b05e120468849dff2cdec44b7309fcaa92cd05 (diff) | |
- Fix displaying nested message parts (#1486246)
git-svn-id: https://svn.roundcube.net/trunk@3150 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_message.php | 7 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 2 | ||||
| -rw-r--r-- | roundcubemail/skins/default/mail.css | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 734a9c776..0971a185c 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix displaying nested message parts (#1486246) - Fix possible messages exposure when using Roundcube behind a proxy (#1486281) - Fix unicode para and line separators in javascript response (#1486310) - additional_message_headers: allow unsetting headers, support plugin's config file (#1486268) diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 1a22427d0..0b6fbb1e9 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -350,14 +350,13 @@ class rcube_message 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; diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 4c8daeed2..1f0b35243 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -3833,7 +3833,7 @@ function rcube_webmail() cell.id = 'rcm'+col; } else if (col == 'subject' && this.message_list) - this.message_list.subject_col = n+1; + this.message_list.subject_col = n; } }; diff --git a/roundcubemail/skins/default/mail.css b/roundcubemail/skins/default/mail.css index 6b4799c71..1876de1c1 100644 --- a/roundcubemail/skins/default/mail.css +++ b/roundcubemail/skins/default/mail.css @@ -972,7 +972,8 @@ table.headers-table tr td.more-headers background-color: #FFFFFF; } -div.message-part +div.message-part, +div.message-htmlpart { padding: 10px 8px; border-top: 1px solid #ccc; |