MDL-55715 calendar: Only update events from the current subscription

The iCal import should only update calendar events from the current subscription not any subscription that contains the same event.
yousuftafhim · Dec 14, 2016 · 4558358 · 4558358
1 parent 5ef81f2
commit 4558358
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/calendar/lib.php b/calendar/lib.php
@@ -3034,7 +3034,7 @@ function calendar_add_icalendar_event($event, $courseid, $subscriptionid, $timez
     $eventrecord->courseid = $sub->courseid;
     $eventrecord->eventtype = $sub->eventtype;
 
-    if ($updaterecord = $DB->get_record('event', array('uuid' => $eventrecord->uuid))) {
+    if ($updaterecord = $DB->get_record('event', array('uuid' => $eventrecord->uuid, 'subscriptionid' => $eventrecord->subscriptionid))) {
         $eventrecord->id = $updaterecord->id;
         $return = CALENDAR_IMPORT_EVENT_UPDATED; // Update.
     } else {