From 5a5eba40dccb5262c89fcdeeb93e49e60321761f Mon Sep 17 00:00:00 2001 From: devjin Date: Wed, 8 Aug 2012 12:11:43 +0000 Subject: [PATCH] issue 1907 modified a function of 'getGroups' to return empty array when group list is null. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11002 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.model.php | 35 +++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 7e6e91794..8c15422f5 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -449,24 +449,33 @@ * @brief Get a list of groups **/ function getGroups($site_srl = 0) { - if(!$GLOBALS['__group_info__'][$site_srl]) { - if(!isset($site_srl)) $site_srl = 0; - $args->site_srl = $site_srl; + if(!$GLOBALS['__group_info__'][$site_srl]) + { + $result = array(); + + if(!isset($site_srl)) + { + $site_srl = 0; + } + $args->site_srl = $site_srl; $args->sort_index = 'list_order'; $args->order_type = 'asc'; - $output = executeQuery('member.getGroups', $args); - if(!$output->data) return; + $output = executeQueryArray('member.getGroups', $args); + if(!$output->toBool() || !$output->data) + { + return array(); + } - $group_list = $output->data; - if(!is_array($group_list)) $group_list = array($group_list); + $group_list = $output->data; - foreach($group_list as $val) { - $result[$val->group_srl] = $val; - } + foreach($group_list as $val) + { + $result[$val->group_srl] = $val; + } - $GLOBALS['__group_info__'][$site_srl] = $result; - } - return $GLOBALS['__group_info__'][$site_srl]; + $GLOBALS['__group_info__'][$site_srl] = $result; + } + return $GLOBALS['__group_info__'][$site_srl]; } /**