From: Sam Hemelryk <sam@moodle.com>
Date: Tue, 27 Nov 2012 22:25:24 +0000 (+1300)
Subject: Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
X-Git-Tag: v2.4.0-rc1~28
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=58014c562114a1525d03e9782ca4bff1322a0a0c;hp=2644c4f33a41be316a7e44d339b7393af1ce584b

Merge branch 'wip-MDL-34530_MASTER' of git://github.com/jason-platts/moodle
---

diff --git a/calendar/lib.php b/calendar/lib.php
index 2549493d441..86ca22ff20e 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1753,11 +1753,19 @@ function calendar_get_allowed_types(&$allowed, $course = null) {
                 $allowed->courses = array($course->id => 1);
 
                 if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
-                    $allowed->groups = groups_get_all_groups($course->id);
+                    if (has_capability('moodle/site:accessallgroups', $coursecontext)) {
+                        $allowed->groups = groups_get_all_groups($course->id);
+                    } else {
+                        $allowed->groups = groups_get_all_groups($course->id, $USER->id);
+                    }
                 }
             } else if (has_capability('moodle/calendar:managegroupentries', $coursecontext)) {
                 if($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
-                    $allowed->groups = groups_get_all_groups($course->id);
+                    if (has_capability('moodle/site:accessallgroups', $coursecontext)) {
+                        $allowed->groups = groups_get_all_groups($course->id);
+                    } else {
+                        $allowed->groups = groups_get_all_groups($course->id, $USER->id);
+                    }
                 }
             }
         }