From f42b6adaff5466ffb8b37e90f81a244b4e1e23da Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 21 May 2010 11:37:55 +0000 Subject: - Patch #805124 by catch: admin/config shows empty admin blocks. --- modules/system/system.admin.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/system/system.admin.inc') 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; -- cgit v1.2.3