diff options
Diffstat (limited to 'modules/block.module')
| -rw-r--r-- | modules/block.module | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/block.module b/modules/block.module index 5ecf0f9ae..df0a67618 100644 --- a/modules/block.module +++ b/modules/block.module @@ -365,7 +365,10 @@ function block_list($region) { ** based on server load. */ if (!($block['throttle'] && (module_invoke('throttle', 'status') > 4))) { - $block = array_merge($block, module_invoke($block['module'], 'block', 'view', $block['delta'])); + $array = module_invoke($block['module'], 'block', 'view', $block['delta']); + if (is_array($array)) { + $block = array_merge($block, $array); + } } if (isset($block['content']) && $block['content']) { $blocks[$region]["$block[module]_$block[delta]"] = (object) $block; |