Merge branch 'wip-MDL-36276-m24' of git://github.com/samhemelryk/moodle

UniGe · Nov 16, 2012 · c941aaf · c941aaf
2 parents 716bf54 + e605987
commit c941aaf
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/calendar/lib.php b/calendar/lib.php
@@ -1465,6 +1465,11 @@ function calendar_edit_event_allowed($event) {
         return false;
     }
 
+    // You cannot edit calendar subscription events presently.
+    if (!empty($event->subscriptionid)) {
+        return false;
+    }
+
     $sitecontext = context_system::instance();
     // if user has manageentries at site level, return true
     if (has_capability('moodle/calendar:manageentries', $sitecontext)) {