From 49a1c52913ec12b890a826ef1999616ece9ba119 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 17 May 2020 19:52:31 +0900 Subject: [PATCH] Fix error in integration search when exclusion list is empty --- .../integration_search/integration_search.model.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index 351802167..96c4c0555 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -59,9 +59,10 @@ class integration_searchModel extends module $args->order_type = 'asc'; $args->statusList = array('PUBLIC'); if(!$args->module_srl) unset($args->module_srl); + if(!$args->exclude_module_srl) unset($args->exclude_module_srl); + // Get a list of documents $oDocumentModel = getModel('document'); - return $oDocumentModel->getDocumentList($args); } @@ -107,11 +108,12 @@ class integration_searchModel extends module $args->sort_index = 'list_order'; $args->order_type = 'asc'; $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'); - $output = $oCommentModel->getTotalCommentList($args); - if(!$output->toBool()|| !$output->data) return $output; - return $output; + return $oCommentModel->getTotalCommentList($args); } /**