MDL-13554 Fix from Mark Nielsen for bad block backups

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 2c6fc076368329eaa04bfa1d6e6c839296de95c5..73cfc8df14da810fcbb4d8cb0069fdb8ac55ae09 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -848,6 +848,11 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                         continue;
                     }
                     $getid = backup_getid($restore->backup_unique_code, $parts[1], $instance->pageid);
+
+                    if (empty($getid->new_id)) {
+                        // Failed, perhaps the module was not included in the restore  MDL-13554
+                        continue;
+                    }
                     $instance->pageid = $getid->new_id;
                 }
                 else {