From f86e8699b9810343f21540ea55ffcd39112ef543 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Thu, 11 May 2017 19:55:21 +0200
Subject: [PATCH] MDL-58904 backup: old backups do not contain new fields

Hence we need to apply DB defaults for them when missing:

  - type = 0
  - timesort = null
---
 backup/moodle2/restore_stepslib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index b23fda48f61..0a715ada68f 100644
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -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,
-- 
2.39.2