diff options
| -rw-r--r-- | program/js/app.js | 6 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js index 9c3252f53..618e07404 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1565,6 +1565,7 @@ function rcube_webmail() parent_uid: flags.parent_uid?flags.parent_uid:0, selected: this.select_all_mode || this.message_list.in_selection(uid), ml: flags.ml?1:0, + ctype: flags.ctype, // flags from plugins flags: flags.extra_flags }); @@ -1658,7 +1659,10 @@ function rcube_webmail() html = '<span id="flagicn'+uid+'" class="'+css_class+'"> </span>'; } else if (c == 'attachment') { - html = flags.attachment ? '<span class="attachment"> </span>' : ' '; + if (/application\/|multipart\/m/.test(flags.ctype)) + html = '<span class="attachment"> </span>'; + else + html = ' '; } else if (c == 'threads') html = expando; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index ab2109fc5..1d65390c2 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -318,8 +318,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null $a_msg_flags['flagged'] = 1; if ($header->others['list-post']) $a_msg_flags['ml'] = 1; - if (preg_match("/(application\/|multipart\/m)/i", $header->ctype)) - $a_msg_flags['attachment'] = 1; + + $a_msg_flags['ctype'] = Q($header->ctype); $a_msg_flags['mbox'] = $mbox; // merge with plugin result |