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

Merge branch 'wip-mdl-30466' of git://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-29 19:45:39 +01:00
parent 2321e0d661 3c33d77817
commit 457e9ab606
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/moodle2/restore_stepslib.php
+5 -11
View File
@@ -2425,8 +2425,6 @@ class restore_module_structure_step extends restore_structure_step {
* - Activity includes completion info (file_exists)
*/
class restore_userscompletion_structure_step extends restore_structure_step {
private $done = array();
/**
* To conditionally decide if this step must be executed
* Note the "settings" conditions are evaluated in the
@@ -2470,15 +2468,14 @@ class restore_userscompletion_structure_step extends restore_structure_step {
$data->userid = $this->get_mappingid('user', $data->userid);
$data->timemodified = $this->apply_date_offset($data->timemodified);
// Find the existing record
$existing = $DB->get_record('course_modules_completion', array(
'coursemoduleid' => $data->coursemoduleid,
'userid' => $data->userid), 'id, timemodified');
// Check we didn't already insert one for this cmid and userid
// (there aren't supposed to be duplicates in that field, but
// it was possible until MDL-28021 was fixed).
$key = $data->coursemoduleid . ',' . $data->userid;
if (array_key_exists($key, $this->done)) {
// Find the existing record
$existing = $DB->get_record('course_modules_completion', array(
'coursemoduleid' => $data->coursemoduleid,
'userid' => $data->userid), 'id, timemodified');
if ($existing) {
// Update it to these new values, but only if the time is newer
if ($existing->timemodified < $data->timemodified) {
$data->id = $existing->id;
@@ -2487,8 +2484,6 @@ class restore_userscompletion_structure_step extends restore_structure_step {
} else {
// Normal entry where it doesn't exist already
$DB->insert_record('course_modules_completion', $data);
// Remember this entry
$this->done[$key] = true;
}
}
@@ -2496,7 +2491,6 @@ class restore_userscompletion_structure_step extends restore_structure_step {
// This gets called once per activity (according to my testing).
// Clearing the array isn't strictly required, but avoids using
// unnecessary memory.
$this->done = array();
}
}