summaryrefslogtreecommitdiff
path: root/modules/block.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/block.module')
-rw-r--r--modules/block.module3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/block.module b/modules/block.module
index d15f3ed4c..ad479f239 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -599,7 +599,8 @@ function block_list($region) {
// Check the current throttle status and see if block should be displayed
// based on server load.
if (!($block->throttle && (module_invoke('throttle', 'status') > 0))) {
- if (is_array($array = module_invoke($block->module, 'block', 'view', $block->delta))) {
+ $array = module_invoke($block->module, 'block', 'view', $block->delta);
+ if (isset($array) && is_array($array)) {
foreach ($array as $k => $v) {
$block->$k = $v;
}