summaryrefslogtreecommitdiff
path: root/program/steps/mail/get.inc
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-01-25 17:57:09 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-01-25 17:57:09 +0100
commitf7c50e28dbd637b3b60c6aea0fac3768f8f59f05 (patch)
treedf0e68dc3d7f6df13473b5f5a717805af0c04c92 /program/steps/mail/get.inc
parent39f883e1f9fab83a47b76fb4802c2d01fa9c4e76 (diff)
parent00a6b75622fb49dfe84173b04f8353fbc4216c9c (diff)
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Diffstat (limited to 'program/steps/mail/get.inc')
-rw-r--r--program/steps/mail/get.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 924433df3..2cc2f12ca 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -150,6 +150,13 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
$disposition = !empty($plugin['download']) ? 'attachment' : 'inline';
+ // Workaround for nasty IE bug (#1488844)
+ // If Content-Disposition header contains string "attachment" e.g. in filename
+ // IE handles data as attachment not inline
+ if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
+ $filename = str_ireplace('attachment', 'attach', $filename);
+ }
+
header("Content-Disposition: $disposition; filename=\"$filename\"");
// do content filtering to avoid XSS through fake images