From c160da9cb828b3a49d86d0bacc86e50e26fe522b Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 7 Aug 2011 13:04:04 +0200 Subject: [PATCH] MDL-28450 prefer member group for default --- lib/grouplib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/grouplib.php b/lib/grouplib.php index 120de12347d..708d2427f81 100644 --- a/lib/grouplib.php +++ b/lib/grouplib.php @@ -717,7 +717,7 @@ function groups_course_module_visible($cm, $userid=null) { * @return void */ function _group_verify_activegroup($courseid, $groupmode, $groupingid, array $allowedgroups) { - global $SESSION; + global $SESSION, $USER; // init activegroup array if necessary if (!isset($SESSION->activegroup)) { @@ -742,7 +742,11 @@ function _group_verify_activegroup($courseid, $groupmode, $groupingid, array $al $SESSION->activegroup[$courseid][$groupmode][$groupingid] = 0; // all groups by default if user has accessallgroups } else if ($allowedgroups) { - $firstgroup = reset($allowedgroups); + if ($groupmode != SEPARATEGROUPS and $mygroups = groups_get_all_groups($courseid, $USER->id, $groupingid)) { + $firstgroup = reset($mygroups); + } else { + $firstgroup = reset($allowedgroups); + } $SESSION->activegroup[$courseid][$groupmode][$groupingid] = $firstgroup->id; } else { -- 2.43.0