From 146c4b7ac13996e88a20d95f1f469fcd568b3708 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Thu, 30 Oct 2014 13:27:23 +0000 Subject: [PATCH] Return IDs set from "get_group_members" function --- .../Mibew/Controller/Group/MembersController.php | 5 +---- src/mibew/libs/groups.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mibew/libs/classes/Mibew/Controller/Group/MembersController.php b/src/mibew/libs/classes/Mibew/Controller/Group/MembersController.php index 642fb7ac..94ff1777 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Group/MembersController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Group/MembersController.php @@ -63,10 +63,7 @@ class MembersController extends AbstractController : ''; // Get list of group's members - $checked_operators = array(); - foreach (get_group_members($group_id) as $rel) { - $checked_operators[] = $rel['operatorid']; - } + $checked_operators = get_group_members($group_id); // Prepare the list of all operators $page['operators'] = array(); diff --git a/src/mibew/libs/groups.php b/src/mibew/libs/groups.php index 4cd78e18..7e2bcca2 100644 --- a/src/mibew/libs/groups.php +++ b/src/mibew/libs/groups.php @@ -431,12 +431,18 @@ function update_group($group) */ function get_group_members($group_id) { - $db = Database::getInstance(); - return $db->query( + $rows = Database::getInstance()->query( "SELECT operatorid FROM {operatortoopgroup} WHERE groupid = ?", array($group_id), array('return_rows' => Database::RETURN_ALL_ROWS) ); + + $operators = array(); + foreach ($rows as $row) { + $operators[] = $row['operatorid']; + } + + return $operators; } /**