From b8da5e77a8a9ebbbddd4003a2c940108b2fa7fc6 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 8 Aug 2016 11:16:59 +0000
Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)    128735 kroast:
 MNT-16510 - Chrome/Firefox Download action issue for document name without
 extension

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/web/scripts/content/ContentGet.java   | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
index e231669146..83e32679d7 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
@@ -33,13 +33,11 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.webscripts.WebScriptException;
@@ -161,21 +159,7 @@ public class ContentGet extends StreamContent implements ServletContextAware
         {
             String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
             
-            // IE use file extension to get mimetype
-            // So we set correct extension. see MNT-11246
-            if (userAgent.contains("msie") || userAgent.contains(" trident/"))
-            {
-                String mimeType = contentService.getReader(nodeRef, propertyQName).getMimetype();
-                    // If we have an unknown mime type (usually marked as binary)
-                    // it is better to stay with the file extension we currently have
-                    // see MNT-14412
-                    if (!mimeType.toLowerCase().equals(MimetypeMap.MIMETYPE_BINARY)
-                            && !mimetypeService.getMimetypes(FilenameUtils.getExtension(name)).contains(mimeType))
-                {
-                    name = FilenameUtils.removeExtension(name) + FilenameUtils.EXTENSION_SEPARATOR_STR + mimetypeService.getExtension(mimeType); 
-                }
-            }
-            
+            // maintain the original name of the node during the download - do not modify it - see MNT-16510
             streamContent(req, res, nodeRef, propertyQName, attach, name, model);
         }
         else