merge from 1.5.2.5 ( ~ r10673)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10674 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-14 08:04:10 +00:00
parent f0c12f5756
commit ea84468e7d
19 changed files with 173 additions and 49 deletions

View file

@ -252,7 +252,7 @@
$division = (int)Context::get('division');
// order by list_order and (module_srl===0 or module_srl many count), therefore case table full scan
if($args->sort_index == 'list_order' && ((int)$args->exclude_module_srl === 0 || count($args->module_srl) > 10))
if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
{
$listSqlID = 'document.getDocumentListUseIndex';
$divisionSqlID = 'document.getDocumentDivisionUseIndex';