Browse files

MDL-37078: Restore - section restore fails with multiple availability…

… conditions
  • Loading branch information...
1 parent 4bd6f71 commit 79e9e6049bd7ae308ce7d9b6fc328b5e31d39f19 @sammarshallou sammarshallou committed Dec 12, 2012
Showing with 4 additions and 4 deletions.
  1. +3 −3 backup/moodle2/restore_stepslib.php
  2. +1 −1 lib/conditionlib.php
View
6 backup/moodle2/restore_stepslib.php
@@ -1259,11 +1259,11 @@ public function after_restore() {
$sectionid = $this->get_task()->get_sectionid();
// Get data object for current section availability (if any).
- $data = $DB->get_record('course_sections_availability',
- array('coursesectionid' => $sectionid), 'id, sourcecmid, gradeitemid', IGNORE_MISSING);
+ $records = $DB->get_records('course_sections_availability',
+ array('coursesectionid' => $sectionid), 'id, sourcecmid, gradeitemid');
// If it exists, update mappings.
- if ($data) {
+ foreach ($records as $data) {
// Only update mappings for entries which are created by this restore.
// Otherwise, when you restore to an existing course, it will mess up
// existing section availability entries.
View
2 lib/conditionlib.php
@@ -942,7 +942,7 @@ public function is_available(&$information, $grabthelot=false, $userid=0, $modin
if (empty($modinfo->cms[$cmid])) {
global $PAGE;
if (isset($PAGE) && strpos($PAGE->pagetype, 'course-view-')===0) {
- debugging("Warning: activity {$this->cm->id} '{$this->cm->name}' has condition " .
+ debugging("Warning: activity {$this->item->id} '{$this->item->name}' has condition " .
"on deleted activity $cmid (to get rid of this message, edit the named activity)");
}
continue;

0 comments on commit 79e9e60

Please sign in to comment.