From 23cef8753b3fe2c03e60d766828a8e0a426d2083 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Mon, 22 May 2017 14:18:04 +0530 Subject: [PATCH] MDL-59011 restore: Check for userride only for activity events --- backup/moodle2/restore_stepslib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php index bfd741bb342..5d607ef780e 100644 --- a/backup/moodle2/restore_stepslib.php +++ b/backup/moodle2/restore_stepslib.php @@ -2658,8 +2658,9 @@ class restore_calendarevents_structure_step extends restore_structure_step { $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) { + // for an activity then we should not create it. (Only activity events can be user override events - which must have this + // setting). + if ($isuseroverride && $this->task->setting_exists('userinfo') && !$this->task->get_setting_value('userinfo')) { return; }