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

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

Browse Source 
101036: Merged DEV (5.1.0) to HEAD-BUG-FIX (5.1/Cloud)
      101019: SHA-52: Downloading file via Quick-Share link does not keep international characters in file names
         - Corrected Spring bean for QuickShareContentGet.
         - Added support for Safari in ContentGet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-04-01 15:18:15 +00:00
parent 9c0fad63f0
commit 71791e3f6f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/web-scripts-application-context.xml
View File

@@ -1757,6 +1757,7 @@
<property name="quickShareService" ref="QuickShareService"/> <property name="quickShareService" ref="QuickShareService"/>
<property name="enabled" value="${system.quickshare.enabled}" /> <property name="enabled" value="${system.quickshare.enabled}" />
<property name="delegate" ref="webscript.content.streamer" /> <property name="delegate" ref="webscript.content.streamer" />
<property name="contentService" ref="ContentService" />
</bean> </bean>
<!-- unauthenticated (note: equivalent to authenticated "thumbnail.get") --> <!-- unauthenticated (note: equivalent to authenticated "thumbnail.get") -->

6
source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
View File

@@ -143,7 +143,11 @@ public class ContentGet extends StreamContent implements ServletContextAware
{ {
String userAgent = req.getHeader("User-Agent"); String userAgent = req.getHeader("User-Agent");
userAgent = userAgent != null ? userAgent.toLowerCase() : ""; userAgent = userAgent != null ? userAgent.toLowerCase() : "";
boolean rfc5987Supported = (userAgent.contains("msie") || userAgent.contains(" trident/") || userAgent.contains(" chrome/") || userAgent.contains(" firefox/")); boolean rfc5987Supported = (userAgent.contains("msie") ||
userAgent.contains(" trident/") ||
userAgent.contains(" chrome/") ||
userAgent.contains(" firefox/") ||
userAgent.contains(" safari/"));
if (attach && rfc5987Supported) if (attach && rfc5987Supported)
{ {