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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2014-03-14 16:04:35 +00:00
parent e288cc2112
commit 9665248b1d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/web/scripts/discussion/ForumTopicsFilteredGet.java
View File

@@ -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<String, String> 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)
);