From 9ed386b6cf63532a35eacd8629d200e372c3c8ca Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Thu, 9 Apr 2009 08:16:47 +0000
Subject: [PATCH] MDL-13843 treat default course grouping as current grouping
 at course level (groupmode is used the same way at course level)

---
 lib/grouplib.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/grouplib.php b/lib/grouplib.php
index a33ee5e5b7f..013631e00a9 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -346,7 +346,7 @@ function groups_print_course_menu($course, $urlroot, $return=false) {
 
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
     if ($groupmode == VISIBLEGROUPS or has_capability('moodle/site:accessallgroups', $context)) {
-        $allowedgroups = groups_get_all_groups($course->id, 0);
+        $allowedgroups = groups_get_all_groups($course->id, 0, $course->defaultgroupingid);
         // detect changes related to groups and fix active group
         if (!empty($SESSION->activegroup[$course->id][VISIBLEGROUPS][0])) {
             if (!array_key_exists($SESSION->activegroup[$course->id][VISIBLEGROUPS][0], $allowedgroups)) {
@@ -362,7 +362,7 @@ function groups_print_course_menu($course, $urlroot, $return=false) {
         }
 
     } else {
-        $allowedgroups = groups_get_all_groups($course->id, $USER->id);
+        $allowedgroups = groups_get_all_groups($course->id, $USER->id, $course->defaultgroupingid);
         // detect changes related to groups and fix active group
         if (isset($SESSION->activegroup[$course->id][SEPARATEGROUPS][0])) {
             if ($SESSION->activegroup[$course->id][SEPARATEGROUPS][0] == 0) {
@@ -548,7 +548,7 @@ function groups_get_course_group($course, $update=false) {
         if ($groupmode == 'aag') {
             $SESSION->activegroup[$course->id][$groupmode][0] = 0; // all groups by default if user has accessallgroups
 
-        } else if ($usergroups = groups_get_all_groups($course->id, $USER->id, 0)) {
+        } else if ($usergroups = groups_get_all_groups($course->id, $USER->id, $course->defaultgroupingid)) {
             $fistgroup = reset($usergroups);
             $SESSION->activegroup[$course->id][$groupmode][0] = $fistgroup->id;
 
@@ -572,9 +572,9 @@ function groups_get_course_group($course, $update=false) {
         } else {
             // first make list of allowed groups
             if ($groupmode == VISIBLEGROUPS or $groupmode == 'aag') {
-                $allowedgroups = groups_get_all_groups($course->id, 0, 0);
+                $allowedgroups = groups_get_all_groups($course->id, 0, $course->defaultgroupingid);
             } else {
-                $allowedgroups = groups_get_all_groups($course->id, $USER->id, 0);
+                $allowedgroups = groups_get_all_groups($course->id, $USER->id, $course->defaultgroupingid);
             }
 
             if ($allowedgroups and array_key_exists($changegroup, $allowedgroups)) {