Merge branch 'MDL-45874' of https://github.com/danielneis/moodle

2014-08-18 23:58:27 +02:00
parent a00678e54b e0530c2f14
commit 6ea7fde09c
1 changed files with 10 additions and 2 deletions
@@ -4132,8 +4132,16 @@ class settings_navigation extends navigation_node {
                }
                $canaccessallgroups = has_capability('moodle/site:accessallgroups', $coursecontext);
                if (!$canaccessallgroups && groups_get_course_groupmode($course) == SEPARATEGROUPS) {
-                    // If groups are in use, make sure we can see that group
-                    return false;
+                    // If groups are in use, make sure we can see that group (MDL-45874).
+                    if ($courseid == $this->page->course->id) {
+                        $mygroups = get_fast_modinfo($this->page->course)->groups;
+                    } else {
+                        $mygroups = groups_get_user_groups($courseid);
+                    }
+                    $usergroups = groups_get_user_groups($courseid, $userid);
+                    if (!array_intersect_key($mygroups[0], $usergroups[0])) {
+                        return false;
+                    }
                }
            }
        }