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

Two missing parameters added

Browse Source
This commit is contained in:
stronk7
2005-01-27 19:43:42 +00:00
parent 9edcd64a76
commit 96e76b6291
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/restore_execute.html
+2 -2
View File
@@ -123,8 +123,8 @@
//If we are deleting and bringing into a course or making a new course, same situation
if($restore->restoreto == 0 || $restore->restoreto == 2) {
echo '<li>'.get_string('creatingblocks');
if (!$status = restore_create_blocks($restore, $xml_file)) {
notify("Error while creating the course blocks");
if (!$status = restore_create_blocks($restore, $info->backup_block_format, $course_header->blockinfo, $xml_file)) {
notify('Error while creating the course blocks');
}
}
}
backup/restorelib.php
+5 -7
View File
@@ -593,12 +593,12 @@
delete_records('block_instance', 'pageid', $restore->course_id, 'pagetype', MOODLE_PAGE_COURSE);
if (empty($backup_block_format)) { // This is a backup from Moodle < 1.5
if (empty($blockinfo)) {
echo " from pre 1.3"; //debug
echo ' (pre 1.3)'; //debug
// Looks like it's from Moodle < 1.3. Let's give the course default blocks...
$newpage = page_create_object(MOODLE_PAGE_COURSE, $restore->course_id);
blocks_repopulate_page($newpage);
} else {
echo " from 1.3-1.4"; //debug
echo ' (1.3-1.4)'; //debug
// We just have a blockinfo field, this is a legacy 1.4 or 1.3 backup
$blockrecords = get_records_select('block', '', '', 'name, id');
$temp_blocks_l = array();
@@ -632,11 +632,9 @@
}
}
}
} else if($info->backup_block_format == 'instances') {
echo " from 1.5"; //debug
if(!$status = restore_create_block_instances($restore,$xml_file)) {
$status = false;
}
} else if($backup_block_format == 'instances') {
echo ' (1.5)'; //debug
$status = restore_create_block_instances($restore,$xml_file);
}
return $status;