diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-04-19 06:38:59 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-04-19 06:38:59 +0000 |
| commit | 1cd0d8c483f99cad1bd4e43e6fa9e3b6ec785931 (patch) | |
| tree | 6cf8fb77358be6af2e686930dafdb7e33cbed163 | |
| parent | e5939b9083d1e65d9076cbe9a2c91552de4017a0 (diff) | |
- Fix attachment name regression (#1488446)
git-svn-id: https://svn.roundcube.net/trunk@6100 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/get.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc index 19be4bd07..f698e38dd 100644 --- a/roundcubemail/program/steps/mail/get.inc +++ b/roundcubemail/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) |