diff -u b/core/lib/Drupal/Core/Menu/MenuTreeParameters.php b/core/lib/Drupal/Core/Menu/MenuTreeParameters.php --- b/core/lib/Drupal/Core/Menu/MenuTreeParameters.php +++ b/core/lib/Drupal/Core/Menu/MenuTreeParameters.php @@ -188,7 +188,7 @@ * * @return $this */ - public function onyEnabledLinks() { + public function onlyEnabledLinks() { $this->addCondition('enabled', 1); return $this; } diff -u b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php --- b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php +++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php @@ -995,7 +995,7 @@ return $tree; } $parameters = new MenuTreeParameters(); - $parameters->setRoot($id)->onyEnabledLinks(); + $parameters->setRoot($id)->onlyEnabledLinks(); return $this->loadTreeData($root['menu_name'], $parameters); } @@ -1055,7 +1055,7 @@ */ public function loadAllChildren($id, $max_relative_depth = NULL) { $parameters = new MenuTreeParameters(); - $parameters->setRoot($id)->excludeRoot()->setMaxDepth($max_relative_depth)->onyEnabledLinks(); + $parameters->setRoot($id)->excludeRoot()->setMaxDepth($max_relative_depth)->onlyEnabledLinks(); $links = $this->loadLinks(NULL, $parameters); foreach ($links as $id => $link) { $links[$id] = $this->prepareLink($link); diff -u b/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php --- b/core/modules/system/src/Controller/SystemController.php +++ b/core/modules/system/src/Controller/SystemController.php @@ -120,7 +120,7 @@ } // Load all menu links below it. $parameters = new MenuTreeParameters(); - $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onyEnabledLinks(); + $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $this->menuLinkTree->load(NULL, $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'), diff -u b/core/modules/system/src/SystemManager.php b/core/modules/system/src/SystemManager.php --- b/core/modules/system/src/SystemManager.php +++ b/core/modules/system/src/SystemManager.php @@ -217,7 +217,7 @@ // Only find the children of this link. $link_id = $instance->getPluginId(); $parameters = new MenuTreeParameters(); - $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onyEnabledLinks(); + $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $this->menuTree->load(NULL, $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'), diff -u b/core/modules/system/src/Tests/System/AdminTest.php b/core/modules/system/src/Tests/System/AdminTest.php --- b/core/modules/system/src/Tests/System/AdminTest.php +++ b/core/modules/system/src/Tests/System/AdminTest.php @@ -128,7 +128,7 @@ // The system.admin link is normally the parent of all top-level admin links. $parameters = new MenuTreeParameters(); - $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onyEnabledLinks(); + $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'), diff -u b/core/modules/system/system.module b/core/modules/system/system.module --- b/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1468,7 +1468,7 @@ if (!isset($tree)) { $parameters = new MenuTreeParameters(); - $parameters->setRoot('system.admin')->excludeRoot()->onyEnabledLinks(); + $parameters->setRoot('system.admin')->excludeRoot()->onlyEnabledLinks(); $tree = $menu_tree->load('system.admin', $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'), diff -u b/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module --- b/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -417,7 +417,7 @@ $menu_tree = \Drupal::menuTree(); // Render the top-level administration menu links. $parameters = new MenuTreeParameters(); - $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onyEnabledLinks(); + $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'), @@ -475,7 +475,7 @@ function toolbar_get_rendered_subtrees() { $menu_tree = \Drupal::menuTree(); $parameters = new MenuTreeParameters(); - $parameters->setRoot('system.admin')->excludeRoot()->setMaxDepth(3)->onyEnabledLinks(); + $parameters->setRoot('system.admin')->excludeRoot()->setMaxDepth(3)->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( array('callable' => 'menu.default_tree_manipulators:checkAccess'), diff -u b/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php b/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php --- b/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php @@ -115,13 +115,13 @@ } /** - * Tests onyEnabledLinks(). + * Tests onlyEnabledLinks(). * - * @covers ::onyEnabledLinks + * @covers ::onlyEnabledLinks */ public function testExcludeDisabledLinks() { $parameters = new MenuTreeParameters(); - $parameters->onyEnabledLinks(); + $parameters->onlyEnabledLinks(); $this->assertEquals(1, $parameters->conditions['enabled']); }