summaryrefslogtreecommitdiff
path: root/program/steps/mail/compose.inc
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-12-29 16:24:46 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-12-29 16:24:46 +0100
commitb26171227804a135b8ba4fef605753ee2121be67 (patch)
tree4f0bcd11f4340cc80f6cd7643991520474fd074c /program/steps/mail/compose.inc
parent54241516d7e4e44520b9c4dea1bc82e078432018 (diff)
parent830fd2ecbb67c395617e1cc38f343d12af0a2861 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/compose.inc')
-rw-r--r--program/steps/mail/compose.inc11
1 files changed, 1 insertions, 10 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 379e920e5..74c6d5f29 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1154,16 +1154,7 @@ function rcmail_save_attachment(&$message, $pid)
}
$mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
- $filename = $part->filename;
- if (!strlen($filename)) {
- if ($mimetype == 'text/html') {
- $filename = rcube_label('htmlmessage');
- }
- else {
- $filename = 'Part_'.$pid;
- }
- $filename .= '.' . $part->ctype_secondary;
- }
+ $filename = rcmail_attachment_name($part);
$attachment = array(
'group' => $COMPOSE['id'],