MDL-8270 ignore blocks that can not be instantiated; merged from MOODLE_19_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index df5e728e318a32ae6f523e30cc3caa4d0a26c23b..70207df345e8664a4e149264e4c19140ffa80f2a 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -119,8 +119,9 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
 
         if ($blocks = get_records('block', 'visible', 1)) {
             foreach ($blocks as $block) {
-                $blockobject = block_instance($block->name);
-                $blockobject->decode_content_links_caller($restore);
+                if ($blockobject = block_instance($block->name)) {
+                    $blockobject->decode_content_links_caller($restore);
+                }
             }
         }