summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-04-19 06:38:59 +0000
committeralecpl <alec@alec.pl>2012-04-19 06:38:59 +0000
commitb4f95a9387a391054ad37c7cfc988ed66adc4b44 (patch)
tree7974af45385e91cef1978083590923259b962f58 /program
parent54758654859b18fbce1e9b9a038311b43f33c7ad (diff)
- Fix attachment name regression (#1488446)
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/get.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 19be4bd07..f698e38dd 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -151,11 +151,10 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
$filename = rcube_label('htmlmessage');
}
else {
- $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube');
+ $ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
+ $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
}
- $ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
- $filename .= $ext;
$filename = preg_replace('[\r\n]', '', $filename);
if ($browser->ie && $browser->ver < 7)