diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php index 5cc34f982..6a93ba070 100644 --- a/modules/communication/communication.model.php +++ b/modules/communication/communication.model.php @@ -378,16 +378,13 @@ class communicationModel extends communication $args = new stdClass(); $args->member_srl = $logged_info->member_srl; - $output = executeQueryArray('communication.getFriendGroups', $args); - - $group_list = $output->data; - if(!$group_list) + $friend_group_list = array(); + foreach ($output->data as $item) { - return; + $friend_group_list[$item->friend_group_srl] = $item; } - - return $group_list; + return $friend_group_list; } /** diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 06f175cea..e24b7a58e 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -294,18 +294,7 @@ class communicationView extends communication $oCommunicationModel = getModel('communication'); // get a group list - $friend_group_list = array(); - $tmp_group_list = $oCommunicationModel->getFriendGroups(); - if (is_countable($tmp_group_list)) - { - $group_count = count($tmp_group_list); - - for($i = 0; $i < $group_count; $i++) - { - $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i]; - } - } - + $friend_group_list = $oCommunicationModel->getFriendGroups(); Context::set('friend_group_list', $friend_group_list); // get a list of friends @@ -385,10 +374,6 @@ class communicationView extends communication // get a group list $friend_group_list = $oCommunicationModel->getFriendGroups(); - if(!is_countable($friend_group_list)) - { - $friend_group_list = array(); - } Context::set('friend_group_list', $friend_group_list); $this->setTemplateFile('add_friend');