diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php index 20cd827..7da995b 100644 --- a/core/lib/Drupal/Core/Extension/ThemeHandler.php +++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php @@ -457,8 +457,8 @@ public function rebuildThemeData() { 'page_top' => 'Page top', 'page_bottom' => 'Page bottom', 'breadcrumb' => 'Breadcrumb', - 'page_tabs' => 'Page tabs', - 'page_actions' => 'Page actions', + 'tabs' => 'Page tabs', + 'actions' => 'Page actions', ), 'description' => '', 'features' => $this->defaultFeatures, diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 463bf6c..24a22cf 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -787,17 +787,11 @@ function system_preprocess_block(&$variables) { break; case 'system_page_actions_block': - $variables['action_links'] = ''; - if ($variables['content']['action_links']) { - $variables['action_links'] = $variables['content']['action_links']; - } + $variables['action_links'] = $variables['content']['action_links']; break; case 'system_page_tabs_block': - $variables['tabs'] = ''; - if ($variables['content']['tabs']) { - $variables['tabs'] = $variables['content']['tabs']; - } + $variables['tabs'] = $variables['content']['tabs']; break; case 'system_powered_by_block':