inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59743: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59519: 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/HEAD/root@62182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 07:57:55 +00:00
parent 63f8379212
commit e45c170f22
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
View File

@@ -390,11 +390,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
// IE requires that "Content-Disposition" header in case of "attachment" type should include // IE requires that "Content-Disposition" header in case of "attachment" type should include
// "filename" part. See MNT-9900 // "filename" part. See MNT-9900
String userAgent = req.getHeader(HEADER_USER_AGENT); String userAgent = req.getHeader(HEADER_USER_AGENT);
if (userAgent != null && userAgent.toLowerCase().contains("msie")) if (userAgent != null && (userAgent.toLowerCase().contains("firefox") || userAgent.toLowerCase().contains("safari")))
{
res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLEncoder.encode(filename) + "\"");
}
else if (userAgent != null && (userAgent.toLowerCase().contains("firefox") || userAgent.toLowerCase().contains("safari")))
{ {
res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLDecoder.decode(filename) + "\""); res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLDecoder.decode(filename) + "\"");
} }