diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-22 17:03:42 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-22 17:03:42 +0000 |
| commit | 51cf18e53176244f264c56cab1c4ff0d1767ac59 (patch) | |
| tree | 833a665ab48dd0d3a54676d78aa9152b0699f21e /modules/block.module | |
| parent | 95cb7f32229e229a39e70a76b2b0f6a14cdc5953 (diff) | |
| download | brdo-51cf18e53176244f264c56cab1c4ff0d1767ac59.tar.gz brdo-51cf18e53176244f264c56cab1c4ff0d1767ac59.tar.bz2 | |
- #9292: Make Drupal (somewhat) PHP5 compatible. xtemplate is still horribly broken.
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; |