summaryrefslogtreecommitdiff
path: root/program/steps/mail/show.inc
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-12-28 12:40:57 +0100
committerAleksander Machniak <alec@alec.pl>2012-12-28 12:40:57 +0100
commitbe72fb3597c21ca3aaa058adf41bb72d53d197c7 (patch)
treef1f77633fb77f105305967b760f7d37a8372409d /program/steps/mail/show.inc
parent8809a1828477101ade03b261662df089e268ecb4 (diff)
Unified attachments filenames handling for message parts without a filename
Diffstat (limited to 'program/steps/mail/show.inc')
-rw-r--r--program/steps/mail/show.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 82594f3e4..22f4ff4c2 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);
if ($PRINT_MODE) {
$size = $RCMAIL->message_part_size($attach_prop);