From 957c03475dad1d8c396c74ac604837adab29aa36 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 15:28:09 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63061: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 62574: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2) 62526: Merged DEV to V4.1-BUG-FIX (4.1.8) 59843: MNT-2258: IE's File Download box does not show a filename correctly when that have non-ASCII characters in the filename - Use legacy filename token with encoded value in "Content-Disposition" header on file download operation for IE7 too. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/web/scripts/content/ContentStreamer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java index 5000b086b7..258b5743b7 100644 --- a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java +++ b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java @@ -634,8 +634,8 @@ public class ContentStreamer implements ResourceLoaderAware else { String userAgent = req.getHeader(HEADER_USER_AGENT); - boolean isMSIE8 = (null != userAgent) && userAgent.contains("MSIE 8"); - if (isMSIE8) + boolean isLegacy = (null != userAgent) && (userAgent.contains("MSIE 8") || userAgent.contains("MSIE 7")); + if (isLegacy) { headerValue += "; filename=\"" + WebDAVHelper.encodeURL(attachFileName); }