Merge branch 'pr/1143' into develop

This commit is contained in:
bnu 2015-03-23 15:26:27 +09:00
commit efa20eeaa0
2 changed files with 68 additions and 1 deletions

View file

@ -224,7 +224,13 @@ class documentModel extends document
$this->_setSearchOption($obj, $args, $query_id, $use_division);
if ($sort_check->isExtraVars)
if ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
{
$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
$args->sort_index = str_replace('documents.','',$args->sort_index);
$output = executeQueryArray($query_id, $args);
}
elseif ($sort_check->isExtraVars)
{
$output = executeQueryArray($query_id, $args);
}