diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Drupal/system/Controller/SystemController.php index 5f55d6e..a766055 100644 --- a/core/modules/system/lib/Drupal/system/Controller/SystemController.php +++ b/core/modules/system/lib/Drupal/system/Controller/SystemController.php @@ -137,12 +137,10 @@ public function overview() { ); if (!empty($block['content']['#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; } - - // 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; } } } diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index ea664dd..c14fb09 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -191,7 +191,6 @@ function theme_system_admin_index($variables) { $block['title'] = $module; $block['content'] = drupal_render($admin_block_content); $block['description'] = t($description); - $block['show'] = TRUE; $admin_block = array( '#theme' => 'admin_block', diff --git a/core/modules/system/templates/admin-block.html.twig b/core/modules/system/templates/admin-block.html.twig index 4c305c2..20aa000 100644 --- a/core/modules/system/templates/admin-block.html.twig +++ b/core/modules/system/templates/admin-block.html.twig @@ -14,15 +14,13 @@ * @ingroup themeable */ #} -{% if block.show %} -
- {% if block.title %} -

{{ block.title }}

- {% endif %} - {% if block.content %} -
{{ block.content }}
- {% elseif block.description %} -
{{ block.description }}
- {% endif %} -
-{% endif %} +
+ {% if block.title %} +

{{ block.title }}

+ {% endif %} + {% if block.content %} +
{{ block.content }}
+ {% elseif block.description %} +
{{ block.description }}
+ {% endif %} +