mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-03 22:55:39 +02:00
Code Issues Projects Releases Wiki Activity

MDL-13921 Incorrect access given to members of group included in 2 groupings; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2008-03-18 16:38:25 +00:00
parent e8b709f14b
commit 0b943ef12c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/grouplib.php
View File

@ -147,17 +147,18 @@ function groups_get_user_groups($courseid, $userid=0) {
$userid = $USER->id;
}
if (!$groups = get_records_sql("SELECT g.id, gg.groupingid
FROM {$CFG->prefix}groups g
JOIN {$CFG->prefix}groups_members gm ON gm.groupid = g.id
LEFT JOIN {$CFG->prefix}groupings_groups gg ON gg.groupid = g.id
WHERE gm.userid = $userid AND g.courseid = $courseid")) {
if (!$rs = get_recordset_sql("SELECT g.id, gg.groupingid
FROM {$CFG->prefix}groups g
JOIN {$CFG->prefix}groups_members gm ON gm.groupid = g.id
LEFT JOIN {$CFG->prefix}groupings_groups gg ON gg.groupid = g.id
WHERE gm.userid = $userid AND g.courseid = $courseid")) {
return array('0' => array());
}
$result = array('0' => array_keys($groups)); // all groups
foreach ($groups as $group) {
$result = array();
$allgroups = array();
while ($group = rs_fetch_next_record($rs)) {
if (is_null($group->groupingid)) {
continue;
}
@ -165,7 +166,11 @@ function groups_get_user_groups($courseid, $userid=0) {
$result[$group->groupingid] = array();
}
$result[$group->groupingid][$group->id] = $group->id;
$allgroups[$group->id] = $group->id;
}
rs_close($rs);
$result['0'] = array_keys($allgroups); // all groups
return $result;
}