From 2a724620f7edd0a7a7df5bdcc924dbc6816a218e Mon Sep 17 00:00:00 2001 From: nfreear Date: Wed, 17 Jan 2007 14:33:29 +0000 Subject: [PATCH] Partial fix for MDL-8048, undid bug introduced last commit. --- group/db/dbbasicgrouplib.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/group/db/dbbasicgrouplib.php b/group/db/dbbasicgrouplib.php index 34c00067fe9..09321f32af6 100644 --- a/group/db/dbbasicgrouplib.php +++ b/group/db/dbbasicgrouplib.php @@ -44,12 +44,17 @@ function groups_db_get_user($userid) { */ function groups_db_get_groups($courseid) { if (! $courseid) { - $groupid = false; - } else { - $groups = get_records('groups_courses_groups', 'courseid', $courseid, - '', $fields='id, groupid'); - // Put the results into an array - $groupids = groups_groups_to_groupids($groups, $courseid); + return false; + } + $records = get_records('groups_courses_groups', 'courseid', $courseid, + '', $fields='id, groupid'); + if (! $records) { + return false; + } + // Put the results into an array, note these are NOT 'group' objects. + $groupids = array(); + foreach ($records as $record) { + array_push($groupids, $record->groupid); } return $groupids; @@ -103,7 +108,7 @@ function groups_db_get_groups_for_user($userid, $courseid) { WHERE cg.courseid = $courseid AND gm.userid=$userid"; $groups = get_records_sql($sql); - $groupids = groups_groups_to_groupids($groups, $courseid); + $groupids = groups_groups_to_groupids($groups); } return $groupids;