L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46651-master-restore-course-completion-duplicate-key' of https://github.com/Trii/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2014-12-16 11:58:53 +00:00
parent 52a7001bc2 7a6ca49af5
commit d3a1c13ed8
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/moodle2/restore_stepslib.php
+15 -1
View File
@@ -2630,7 +2630,21 @@ class restore_course_completion_structure_step extends restore_structure_step {
'timecompleted' => $this->apply_date_offset($data->timecompleted),
'reaggregate' => $data->reaggregate
);
$DB->insert_record('course_completions', $params);
$existing = $DB->get_record('course_completions', array(
'userid' => $data->userid,
'course' => $data->course
));
// MDL-46651 - If cron writes out a new record before we get to it
// then we should replace it with the Truth data from the backup.
// This may be obsolete after MDL-48518 is resolved
if ($existing) {
$params['id'] = $existing->id;
$DB->update_record('course_completions', $params);
} else {
$DB->insert_record('course_completions', $params);
}
}
}