diff --git a/lib/blocklib.php b/lib/blocklib.php index 5ca1802ce65..34a5d6c4dd0 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -264,6 +264,12 @@ function blocks_print_group(&$page, &$pageblocks, $position) { foreach($pageblocks[$position] as $instance) { $block = blocks_get_record($instance->blockid); + + if (empty($block)) { + // Block doesn't exist! We should delete this instance! + continue; + } + if(!$block->visible) { // Disabled by the admin continue; @@ -325,6 +331,11 @@ function blocks_preferred_width(&$instances) { continue; } + if (!array_key_exists($instance->blockid, $blocks)) { + // Block doesn't exist! We should delete this instance! + continue; + } + if(!$blocks[$instance->blockid]->visible) { continue; }