calendar MDL-19793 Fixed minor regressions caused by recent updates

diff --git a/calendar/lib.php b/calendar/lib.php
index ec291bdf172b456b9356ea2a5e92e96664883182..cb81ec65de2c557565935fe04d4eb8d530e88ce0 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1658,6 +1658,9 @@ function calendar_add_event_allowed($event) {
             return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, SITEID));
 
         default:
+            if (isset($event->courseid) && $event->courseid > 0) {
+                return has_capability('moodle/calendar:manageentries', get_context_instance(CONTEXT_COURSE, $event->courseid));
+            }
             return false;
     }
 }
@@ -2051,6 +2054,8 @@ class calendar_event {
                 add_to_log($this->properties->courseid, 'calendar', 'edit all', 'event.php?action=edit&id='.$this->properties->id, $this->properties->name);
             } else {
                 $DB->update_record('event', $this->properties);
+                $event = calendar_event::load($this->properties->id);
+                $this->properties = $event->properties();
                 add_to_log($this->properties->courseid, 'calendar', 'edit', 'event.php?action=edit&id='.$this->properties->id, $this->properties->name);
             }