Merge branch 'MDL-67027' of https://github.com/paulholden/moodle

mpetrowi · Oct 29, 2019 · 501c568 · 501c568
2 parents 7ddf5ab + c0c9cf3
commit 501c568
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper.php b/calendar/classes/local/event/mappers/create_update_form_mapper.php
@@ -70,11 +70,13 @@ public function from_legacy_event_to_data(\calendar_event $legacyevent) {
             'format' => $data->format
         ];
 
-        // We don't want to return the context because it's not a
-        // form value and breaks the validation.
+        // Don't return context or subscription because they're not form values and break validation.
         if (isset($data->context)) {
             unset($data->context);
         }
+        if (isset($data->subscription)) {
+            unset($data->subscription);
+        }
 
         return $data;
     }