From: skodak <skodak>
Date: Sun, 30 Mar 2008 14:36:27 +0000 (+0000)
Subject: MDL-8270 ignore blocks that can not be instantiated; merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4a80e5cb05f96d2b68aec6e4b909afaf7e16721d;p=moodle.git

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 df5e728e31..70207df345 100644
--- 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);
+                }
             }
         }