diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-12-29 16:24:46 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-12-29 16:24:46 +0100 |
| commit | b26171227804a135b8ba4fef605753ee2121be67 (patch) | |
| tree | 4f0bcd11f4340cc80f6cd7643991520474fd074c /program/steps/mail/show.inc | |
| parent | 54241516d7e4e44520b9c4dea1bc82e078432018 (diff) | |
| parent | 830fd2ecbb67c395617e1cc38f343d12af0a2861 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/show.inc')
| -rw-r--r-- | program/steps/mail/show.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 82594f3e4..64e628880 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -150,10 +150,7 @@ function rcmail_message_attachments($attrib) if (sizeof($MESSAGE->attachments)) { foreach ($MESSAGE->attachments as $attach_prop) { - $filename = $attach_prop->filename; - if (empty($filename) && $attach_prop->mimetype == 'text/html') { - $filename = rcube_label('htmlmessage'); - } + $filename = rcmail_attachment_name($attach_prop, true); if ($PRINT_MODE) { $size = $RCMAIL->message_part_size($attach_prop); |