moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Just a little bit more reobust in the face of badly-behaved blocks

Browse source
This commit is contained in:
moodler 2005-01-18 06:03:26 +00:00
parent 221a85301e
commit 7933cc6be5
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/blocklib.php
View file

@ -154,11 +154,15 @@ function blocks_delete_instance($instance) {
// by reference for speed; the array is actually not modified. // by reference for speed; the array is actually not modified.
function blocks_have_content(&$instances) { function blocks_have_content(&$instances) {
foreach($instances as $instance) { foreach($instances as $instance) {
if(!$instance->visible) { if (!$instance->visible) {
continue;
}
if (!$record = blocks_get_record($instance->blockid)) {
continue;
}
if (!$obj = block_instance($record->name, $instance)) {
continue; continue;
} }
$record = blocks_get_record($instance->blockid);
$obj = block_instance($record->name, $instance);
$content = $obj->get_content(); $content = $obj->get_content();
$type = $obj->get_content_type(); $type = $obj->get_content_type();
switch($type) { switch($type) {