Only abbreviate file name for IE browsers (#1485063)

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3cef60c7c..7228b440d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/12/16 (thomasb)
+----------
+- Only abbreviate file name for IE browsers (#1485063)
+
 2008/12/11 (alec)
 ----------
 - Performance: allow setting imap rootdir and delimiter before connect (#1485172)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 2d51ffc46..9d696746a 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -89,8 +89,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
       }
       
       $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
-      $filename = abbreviate_string($part->filename, 55);
-      $filename = $browser->ie ? rawurlencode($filename) : addcslashes($filename, '"');
+      $filename = $browser->ie ? rawurlencode(abbreviate_string($filename, 55)) : addcslashes($filename, '"');
       $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
       
       header("Content-Disposition: $disposition; filename=\"$filename\"");