diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-11-23 13:14:11 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-11-23 13:14:11 +0100 |
| commit | 8c5f4055873e171bd4abcd0dfe56a7b3a01f733a (patch) | |
| tree | 8bd8848f9311e8f5048e453177e878a60bddbd0c | |
| parent | fac292a410eb412b8e51e7ed64e21cba206e39b9 (diff) | |
Set real content-type for file downloads (#1489439)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/get.inc | 8 |
2 files changed, 2 insertions, 7 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Set real content-type for file downloads (#1489439) - Update TinyMCE to version 3.5.10 (#1489442) - Fix keyboard navigation in list widgets (#1489392) - Allow plugins to grab the reference of opened windows (#1489413) diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index ae48307e3..be1366dcf 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -220,13 +220,7 @@ else if (strlen($part_id)) { $browser = $RCMAIL->output->browser; list($ctype_primary, $ctype_secondary) = explode('/', $mimetype); - // send download headers - if ($plugin['download']) { - header("Content-Type: application/octet-stream"); - if ($browser->ie) - header("Content-Type: application/force-download"); - } - else if ($ctype_primary == 'text') { + if (!$plugin['download'] && $ctype_primary == 'text') { header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET)); } else { |