From 3820d07df8004c94474ede60906bcfa41414d0ef Mon Sep 17 00:00:00 2001 From: ovclas Date: Wed, 28 Sep 2011 05:54:51 +0000 Subject: [PATCH] issue 160, fix a bug related integration comments search - by sinsy200 git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9386 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../integration_search/integration_search.model.php | 10 ++++++++-- modules/integration_search/integration_search.view.php | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php index 50539b82f..382e8a1d8 100644 --- a/modules/integration_search/integration_search.model.php +++ b/modules/integration_search/integration_search.model.php @@ -45,10 +45,16 @@ * @brief Comment Search **/ function getComments($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) { - if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list); - else $module_srls = $module_srls_list; + if(is_array($module_srls_list)){ + if (count($module_srls_list) > 0) $module_srls = implode(',',$module_srls_list); + else $module_srls = 0; + } + else { + $module_srls = ($module_srls_list)?$module_srls_list:0; + } if($target == 'exclude') $args->exclude_module_srl = $module_srls; else $args->module_srl = $module_srls; + $args->page = $page; $args->list_count = $list_count; $args->page_count = 10; diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index bc53ac871..8b459d8d5 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -35,7 +35,12 @@ $target = $config->target; if(!$target) $target = 'include'; - $module_srl_list = explode(',',$config->target_module_srl); + + if (empty($config->target_module_srl)) + $module_srl_list = array(); + else + $module_srl_list = explode(',',$config->target_module_srl); + // Set a variable for search keyword $is_keyword = Context::get('is_keyword'); // Set page variables