diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index f95a890..405503e 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -181,6 +181,7 @@ function toolbar_toolbar() { '#attached' => $subtrees_attached, 'toolbar_administration' => array( '#pre_render' => array( + '#menu' => 'system.admin', 'toolbar_prerender_toolbar_administration_tray', ), '#type' => 'container', @@ -210,7 +211,7 @@ function toolbar_prerender_toolbar_administration_tray(array $element) { $menu_tree = \Drupal::menuTree(); // Render the top-level administration menu links. $parameters = new MenuTreeParameters(); - $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); + $parameters->setRoot($element['#menu'])->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'),