Merge branch 'MDL-58904' of git://github.com/stronk7/moodle

2017-05-12 10:22:19 +08:00
parent bcf69a655a f86e8699b9
commit d9d2c2f86f
1 changed files with 2 additions and 2 deletions
@@ -2705,11 +2705,11 @@ class restore_calendarevents_structure_step extends restore_structure_step {
                'userid'         => $data->userid,
                'repeatid'       => $this->get_mappingid('event', $data->repeatid),
                'modulename'     => $data->modulename,
-                'type'           => $data->type,
+                'type'           => isset($data->type) ? $data->type : 0,
                'eventtype'      => $data->eventtype,
                'timestart'      => $this->apply_date_offset($data->timestart),
                'timeduration'   => $data->timeduration,
-                'timesort'       => $this->apply_date_offset($data->timesort),
+                'timesort'       => isset($data->timesort) ? $this->apply_date_offset($data->timesort) : null,
                'visible'        => $data->visible,
                'uuid'           => $data->uuid,
                'sequence'       => $data->sequence,