alecpl
2009-12-03 3815e050e0e0ddafb919741426f3c36ebdadb9a8
- Fix displaying nested message parts (#1486246)


4 files modified
13 ■■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
program/include/rcube_message.php 7 ●●●●● patch | view | raw | blame | history
program/js/app.js 2 ●●● patch | view | raw | blame | history
skins/default/mail.css 3 ●●●● patch | view | raw | blame | history
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)
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;
program/js/app.js
@@ -3833,7 +3833,7 @@
        cell.id = 'rcm'+col;
        }
      else if (col == 'subject' && this.message_list)
        this.message_list.subject_col = n+1;
        this.message_list.subject_col = n;
      }
  };
skins/default/mail.css
@@ -972,7 +972,8 @@
  background-color: #FFFFFF;
}
div.message-part
div.message-part,
div.message-htmlpart
{
  padding: 10px 8px;
  border-top: 1px solid #ccc;