diff --git a/core/includes/theme.inc b/core/includes/theme.inc index c726d07..e322851 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1833,10 +1833,16 @@ function template_preprocess_page(&$variables) { // Pass the main menu and secondary menu to the template as render arrays. if (!empty($variables['main_menu'])) { - $variables['main_menu']['#prefix'] = ''; + $primary_menu_links_source = _menu_get_links_source('main_links', 'main'); + if ($primary_menu_heading = \Drupal::config('system.menu.' . $primary_menu_links_source)->get('label')) { + $variables['main_menu']['#prefix'] = ''; + } } if (!empty($variables['secondary_menu'])) { - $variables['secondary_menu']['#prefix'] = ''; + $secondary_menu_links_source = _menu_get_links_source('secondary_links', 'account'); + if ($secondary_menu_heading = \Drupal::config('system.menu.' . $secondary_menu_links_source)->get('label')) { + $variables['secondary_menu']['#prefix'] = ''; + } } if ($node = \Drupal::routeMatch()->getParameter('node')) {