From c33e03ae951bed75e1c73d633dd9ea6fa993029a Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Wed, 14 Jun 2017 14:32:53 +0530 Subject: [PATCH] MDL-44961 logs: Keep log dates constant during restore --- .../moodle2/restore_tool_log_logstore_subplugin.class.php | 3 +-- backup/moodle2/restore_stepslib.php | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/tool/log/backup/moodle2/restore_tool_log_logstore_subplugin.class.php b/admin/tool/log/backup/moodle2/restore_tool_log_logstore_subplugin.class.php index 0c00f00880a..c48c2c86c24 100644 --- a/admin/tool/log/backup/moodle2/restore_tool_log_logstore_subplugin.class.php +++ b/admin/tool/log/backup/moodle2/restore_tool_log_logstore_subplugin.class.php @@ -84,8 +84,7 @@ abstract class restore_tool_log_logstore_subplugin extends restore_subplugin { } } - // Roll dates. - $data->timecreated = $this->apply_date_offset($data->timecreated); + // There is no need to roll dates. Logs are supposed to be immutable. See MDL-44961. // Revert other to its original php way. $data->other = unserialize(base64_decode($data->other)); diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php index 6d5b828803b..8881ba5c31c 100644 --- a/backup/moodle2/restore_stepslib.php +++ b/backup/moodle2/restore_stepslib.php @@ -3058,7 +3058,8 @@ class restore_course_logs_structure_step extends restore_structure_step { $data = (object)($data); - $data->time = $this->apply_date_offset($data->time); + // There is no need to roll dates. Logs are supposed to be immutable. See MDL-44961. + $data->userid = $this->get_mappingid('user', $data->userid); $data->course = $this->get_courseid(); $data->cmid = 0; @@ -3105,7 +3106,8 @@ class restore_activity_logs_structure_step extends restore_course_logs_structure $data = (object)($data); - $data->time = $this->apply_date_offset($data->time); + // There is no need to roll dates. Logs are supposed to be immutable. See MDL-44961. + $data->userid = $this->get_mappingid('user', $data->userid); $data->course = $this->get_courseid(); $data->cmid = $this->task->get_moduleid();