diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-05-21 11:37:55 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-05-21 11:37:55 +0000 |
| commit | f42b6adaff5466ffb8b37e90f81a244b4e1e23da (patch) | |
| tree | 2fe7eea365dea4cd23a06880e75bc0ccd5a4594a /modules/system/system.admin.inc | |
| parent | 34792fa8aec511d43a529f89383a013108c26bea (diff) | |
| download | brdo-f42b6adaff5466ffb8b37e90f81a244b4e1e23da.tar.gz brdo-f42b6adaff5466ffb8b37e90f81a244b4e1e23da.tar.bz2 | |
- Patch #805124 by catch: admin/config shows empty admin blocks.
Diffstat (limited to 'modules/system/system.admin.inc')
| -rw-r--r-- | modules/system/system.admin.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 31148f7eb..618e2b878 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -97,12 +97,15 @@ function system_admin_config_page() { } $block = $item; $block['content'] = ''; - $block['show'] = TRUE; if ($item['block_callback'] && function_exists($item['block_callback'])) { $function = $item['block_callback']; $block['content'] .= $function(); } $block['content'] .= theme('admin_block_content', array('content' => system_admin_menu_block($item))); + if (!empty($block['content'])) { + $block['show'] = TRUE; + } + // Prepare for sorting as in function _menu_tree_check_access(). // The weight is offset so it is always positive, with a uniform 5-digits. $blocks[(50000 + $item['weight']) . ' ' . $item['title'] . ' ' . $item['mlid']] = $block; |