From 38bc0964442474909b69bc3243b993dc4af8f4a6 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Thu, 30 Oct 2014 13:49:16 +0000 Subject: [PATCH] Return IDs set from "get_operator_group_ids" function --- .../Mibew/Controller/Operator/GroupsController.php | 4 +--- src/mibew/libs/groups.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mibew/libs/classes/Mibew/Controller/Operator/GroupsController.php b/src/mibew/libs/classes/Mibew/Controller/Operator/GroupsController.php index 33ef6d67..60807620 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Operator/GroupsController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Operator/GroupsController.php @@ -68,9 +68,7 @@ class GroupsController extends AbstractController // Get IDs of groups the operator belongs to. $checked_groups = array(); if ($op) { - foreach (get_operator_group_ids($op_id) as $rel) { - $checked_groups[] = $rel['groupid']; - } + $checked_groups = get_operator_group_ids($op_id); } // Get all available groups diff --git a/src/mibew/libs/groups.php b/src/mibew/libs/groups.php index 7e2bcca2..49512356 100644 --- a/src/mibew/libs/groups.php +++ b/src/mibew/libs/groups.php @@ -635,13 +635,18 @@ function get_sorted_groups($order) function get_operator_group_ids($operator_id) { - $db = Database::getInstance(); - - return $db->query( + $rows = Database::getInstance()->query( "SELECT groupid FROM {operatortoopgroup} WHERE operatorid = ?", array($operator_id), array('return_rows' => Database::RETURN_ALL_ROWS) ); + + $groups = array(); + foreach ($rows as $row) { + $groups[] = $row['groupid']; + } + + return $groups; } function get_operators_from_adjacent_groups($operator)