From 40b4d6ababe826920b55c3663f0b5d5685de65d7 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Wed, 8 Jan 2014 13:42:27 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) 59442: Merged DEV to V4.1-BUG-FIX (4.1.8) 59317: MNT-9900 : Alfresco Explorer is using URL Encoding when downloading a file Removed additional encoding of file name for IE browser. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/app/servlet/BaseDownloadContentServlet.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java index 3509065c6d..ae20e69175 100644 --- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java +++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java @@ -390,11 +390,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet // IE requires that "Content-Disposition" header in case of "attachment" type should include // "filename" part. See MNT-9900 String userAgent = req.getHeader(HEADER_USER_AGENT); - if (userAgent != null && userAgent.toLowerCase().contains("msie")) - { - res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLEncoder.encode(filename) + "\""); - } - else if (userAgent != null && (userAgent.toLowerCase().contains("firefox") || userAgent.toLowerCase().contains("safari"))) + if (userAgent != null && (userAgent.toLowerCase().contains("firefox") || userAgent.toLowerCase().contains("safari"))) { res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLDecoder.decode(filename) + "\""); }