fixed moodle/calendar:manageentries capability in calendar; merged from MOODLE_17_STABLE

diff --git a/calendar/event.php b/calendar/event.php
index 5ba8ce51bffe2a718aeee4e5c7eb4ed3353664fb..2d52714a033dba01d7e6242683b619b28d567fb2 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -589,7 +589,7 @@ function calendar_add_event_allowed($courseid, $groupid, $userid) {
     
     $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
     // if user has manageentries at site level, return true
-    if (has_capability('manageentries', $sitecontext)) {
+    if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
         return true;
     }
 

diff --git a/calendar/lib.php b/calendar/lib.php
index c4e859af217496160576999ae56569ea588143d7..b3a465d0379e82e94927251b8f7f539a27578b0c 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1174,7 +1174,7 @@ function calendar_edit_event_allowed($event) {
     
     $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
     // if user has manageentries at site level, return true
-    if (has_capability('manageentries', $sitecontext)) {
+    if (has_capability('moodle/calendar:manageentries', $sitecontext)) {
         return true;
     }