From 9665248b1d67270d9fccc7e60c52f9cb2910571b Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 16:04:35 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63335: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 63264: Merged DEV to V4.2-BUG-FIX (4.2.2) 63206 : MNT-10760 : "Error loading items" in My Discussions dashlet on Site Dashboard - Added encoding to ISO9075 of search query for discussions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/discussion/ForumTopicsFilteredGet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java b/source/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java index 5b15169802..38ce49d27e 100644 --- a/source/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java +++ b/source/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java @@ -43,6 +43,7 @@ import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.site.SiteInfo; +import org.alfresco.util.ISO9075; import org.alfresco.util.Pair; import org.alfresco.util.ScriptPagingDetails; import org.json.simple.JSONObject; @@ -247,7 +248,7 @@ public class ForumTopicsFilteredGet extends AbstractDiscussionWebScript protected Pair getSearchQuery(SiteInfo site, String author, int daysAgo) { String search = String.format(SEARCH_QUERY, - (site != null ? "cm:" + site.getShortName() : "*"), + (site != null ? "cm:" + ISO9075.encode(site.getShortName()) : "*"), getDateXDaysAgo(daysAgo) );