fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix error in integration search when exclusion list is empty

Browse source
This commit is contained in:
Kijin Sung 2020-05-17 19:52:31 +09:00
parent bd94b6915e
commit 49a1c52913
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/integration_search/integration_search.model.php
View file

@ -59,9 +59,10 @@ class integration_searchModel extends module
$args->order_type = 'asc'; $args->order_type = 'asc';
$args->statusList = array('PUBLIC'); $args->statusList = array('PUBLIC');
if(!$args->module_srl) unset($args->module_srl); if(!$args->module_srl) unset($args->module_srl);
if(!$args->exclude_module_srl) unset($args->exclude_module_srl);
// Get a list of documents // Get a list of documents
$oDocumentModel = getModel('document'); $oDocumentModel = getModel('document');
return $oDocumentModel->getDocumentList($args); return $oDocumentModel->getDocumentList($args);
} }
@ -107,11 +108,12 @@ class integration_searchModel extends module
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
$args->order_type = 'asc'; $args->order_type = 'asc';
$args->statusList = array(1); $args->statusList = array(1);
// Get a list of documents if(!$args->module_srl) unset($args->module_srl);
if(!$args->exclude_module_srl) unset($args->exclude_module_srl);
// Get a list of comments
$oCommentModel = getModel('comment'); $oCommentModel = getModel('comment');
$output = $oCommentModel->getTotalCommentList($args); return $oCommentModel->getTotalCommentList($args);
if(!$output->toBool()|| !$output->data) return $output;
return $output;
} }
/** /**