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

Backporting from HEAD some recent improvements in order to be able

Browse Source 
to restore block instances properly. MDL-4934
This commit is contained in:
stronk7
2008-04-27 01:49:44 +00:00
parent 141dd0001f
commit 02671df098
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/restorelib.php
+16 -4
View File
@@ -860,10 +860,22 @@
//Add this instance
$instance->blockid = $blocks[$instance->name]->id;
if ($newid = insert_record('block_instance', $instance)) {
if (!empty($instance->id)) { // this will only be set if we come from 1.7 and above backups
backup_putid ($restore->backup_unique_code,"block_instance",$instance->id,$newid);
if (!empty($instance->id)) {
$oldid = $instance->id;
} else {
$oldid = 0;
}
if ($instance->id = insert_record('block_instance', $instance)) {
// Create block instance
if (!$blockobj = block_instance($instance->name, $instance)) {
$status = false;
break;
}
// Save oldid after block restore process because info will be over-written with blank string
if ($oldid) {
backup_putid ($restore->backup_unique_code,"block_instance",$oldid,$instance->id);
}
} else {
$status = false;