Merge pull request #2138 from dewekk/fix-search-tag

특정 환경에서 태그 및 댓글 검색 시 오류 수정
This commit is contained in:
Kijin Sung 2023-06-29 01:48:27 +09:00 committed by GitHub
commit 32adc75b94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1496,10 +1496,6 @@ class DocumentModel extends Document
$args->sort_index = 'extra_sort.value'; $args->sort_index = 'extra_sort.value';
} }
$query_id = 'document.getDocumentListWithExtraVars'; $query_id = 'document.getDocumentListWithExtraVars';
if($args->columnList && !in_array($args->sort_index, $args->columnList))
{
$args->columnList[] = $args->sort_index;
}
} }
else else
{ {
@ -1557,6 +1553,10 @@ class DocumentModel extends Document
} }
$args->columnList[$key] = 'documents.' . $column; $args->columnList[$key] = 'documents.' . $column;
} }
if($args->columnList && !in_array($args->sort_index, $args->columnList))
{
$args->columnList[] = $args->sort_index;
}
} }
/** /**