MDL-33465 fix incorrect merge conflict resolution
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 8 Jun 2012 08:55:39 +0000 (10:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 8 Jun 2012 08:55:39 +0000 (10:55 +0200)
backup/moodle2/restore_stepslib.php

index 8f86f67..a17ce84 100644 (file)
@@ -1106,7 +1106,6 @@ class restore_section_structure_step extends restore_structure_step {
 
         // Annotate the section mapping, with restorefiles option if needed
         $this->set_mapping('course_section', $oldid, $newitemid, $restorefiles);
-        $this->set_mapping('course_sectionnumber', $oldsection, $section->section);
 
         // set the new course_section id in the task
         $this->task->set_sectionid($newitemid);
@@ -2584,7 +2583,6 @@ class restore_module_structure_step extends restore_structure_step {
                 'course' => $this->get_courseid(),
                 'section' => 1);
             $data->section = $DB->insert_record('course_sections', $sectionrec); // section 1
-            $this->set_mapping('course_sectionnumber', $oldsection, 1); // Assign unmatching sections to section 1.
         }
         $data->groupingid= $this->get_mappingid('grouping', $data->groupingid);      // grouping
         if (!$CFG->enablegroupmembersonly) {                                         // observe groupsmemberonly