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 V3.2 to HEAD

Browse Source 
15358: Merged V3.1 to V3.2
      15356: Fix for ETHREEOH-2561
   15417: Fix for ETHREEOH-2437 - use 'write' webscript transaction to create Calendar container on first refresh.
   15480: Merged V3.1 to V3.2
      15479: Fix to unreported issue with JS search API.
   15481: Fix to unreported XSS issue in Add As Favourite site functionality.
   15482: Maxresults value now passed into underlying search API in search lib JS for improved performance executing large searches in Share.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-07-30 08:46:18 +00:00
parent 24f5a529c6
commit c1b4e119c1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -315,13 +315,13 @@ public class Search extends BaseScopableProcessorExtension
{ {
return Context.getCurrentContext().newArray(getScope(), 0); return Context.getCurrentContext().newArray(getScope(), 0);
} }
if (sortColumn == null || sortColumn.length() == 0)
{
return luceneSearch(store, search);
}
SortColumn[] sort = new SortColumn[1]; SortColumn[] sort = null;
if (sortColumn != null && sortColumn.length() != 0)
{
sort = new SortColumn[1];
sort[0] = new SortColumn(sortColumn, asc); sort[0] = new SortColumn(sortColumn, asc);
}
Object[] results = query(store, search, sort, SearchService.LANGUAGE_LUCENE, max, 0); Object[] results = query(store, search, sort, SearchService.LANGUAGE_LUCENE, max, 0);
return Context.getCurrentContext().newArray(getScope(), results); return Context.getCurrentContext().newArray(getScope(), results);
} }