Permalink
Browse files

MDL-39000 Conditional activities: Section condition restore errors

  • Loading branch information...
1 parent 7d253e0 commit 70c3c66943307cd4c74660ac89078b6dd01972d2 @sammarshallou sammarshallou committed Apr 9, 2013
Showing with 7 additions and 2 deletions.
  1. +7 −2 backup/moodle2/restore_stepslib.php
@@ -1166,7 +1166,7 @@ public function after_restore() {
// Otherwise, when you restore to an existing course, it will mess up
// existing section availability entries.
if (!$this->get_mappingid('course_sections_availability', $data->id, false)) {
- return;
+ continue;
}
// Update source cmid / grade id to new value.
@@ -1179,7 +1179,12 @@ public function after_restore() {
$data->gradeitemid = null;
}
- $DB->update_record('course_sections_availability', $data);
+ // Delete the record if the condition wasn't found, otherwise update it.
+ if ($data->sourcecmid === null && $data->gradeitemid === null) {
+ $DB->delete_records('course_sections_availability', array('id' => $data->id));
+ } else {
+ $DB->update_record('course_sections_availability', $data);
+ }
}
}
}

0 comments on commit 70c3c66

Please sign in to comment.