diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php index 596259ee3c9..acdf34b45ed 100644 --- a/backup/moodle2/backup_stepslib.php +++ b/backup/moodle2/backup_stepslib.php @@ -863,8 +863,9 @@ class backup_calendarevents_structure_step extends backup_structure_step { $event = new backup_nested_element('event', array('id'), array( 'name', 'description', 'format', 'courseid', 'groupid', 'userid', - 'repeatid', 'modulename', 'instance', 'eventtype', 'timestart', - 'timeduration', 'visible', 'uuid', 'sequence', 'timemodified')); + 'repeatid', 'modulename', 'instance', 'type', 'eventtype', 'timestart', + 'timeduration', 'timesort', 'visible', 'uuid', 'sequence', 'timemodified', + 'priority')); // Build the tree $events->add_child($event); diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php index 89b15921228..b23fda48f61 100644 --- a/backup/moodle2/restore_stepslib.php +++ b/backup/moodle2/restore_stepslib.php @@ -2657,7 +2657,6 @@ class restore_calendarevents_structure_step extends restore_structure_step { // both a modulename and instance value set. $isuseroverride = !$data->courseid && $data->modulename && $data->instance; - // If we don't want to include user data and this record is a user override event // for an activity then we should not create it. if (!$this->task->get_setting_value('userinfo') && $isuseroverride) { @@ -2706,13 +2705,16 @@ 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, 'eventtype' => $data->eventtype, 'timestart' => $this->apply_date_offset($data->timestart), 'timeduration' => $data->timeduration, + 'timesort' => $this->apply_date_offset($data->timesort), 'visible' => $data->visible, 'uuid' => $data->uuid, 'sequence' => $data->sequence, - 'timemodified' => $this->apply_date_offset($data->timemodified)); + 'timemodified' => $this->apply_date_offset($data->timemodified), + 'priority' => $data->priority); if ($this->name == 'activity_calendar') { $params['instance'] = $this->task->get_activityid(); } else {