mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-33465 fix incorrect merge conflict resolution

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-06-08 10:55:39 +02:00
parent ec3d3ede80
commit 78117cb1a4
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backup/moodle2/restore_stepslib.php
View 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