diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index 569df61..efe5d0f 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -75,10 +75,8 @@ function menu_ui_entity_type_build(array &$entity_types) { ->setListBuilderClass('Drupal\menu_ui\MenuListBuilder') ->setLinkTemplate('add-form', 'menu_ui.menu_add') ->setLinkTemplate('delete-form', 'menu_ui.delete_menu') - ->setLinkTemplate('edit-form', 'menu_ui.menu_edit'); - if (isset($entity_types['menu_link_content'])) { - $entity_types['menu']->setLinkTemplate('add-link-form', 'menu_link_content.link_add'); - } + ->setLinkTemplate('edit-form', 'menu_ui.menu_edit') + ->setLinkTemplate('add-link-form', 'menu_link_content.link_add'); } diff --git a/core/modules/menu_ui/src/MenuListBuilder.php b/core/modules/menu_ui/src/MenuListBuilder.php index a4d900f..4fdb298 100644 --- a/core/modules/menu_ui/src/MenuListBuilder.php +++ b/core/modules/menu_ui/src/MenuListBuilder.php @@ -51,12 +51,10 @@ public function getDefaultOperations(EntityInterface $entity) { if (isset($operations['edit'])) { $operations['edit']['title'] = t('Edit menu'); - if ($this->moduleHandler()->moduleExists('menu_link_content')) { - $operations['add'] = array( - 'title' => t('Add link'), - 'weight' => 20, - ) + $entity->urlInfo('add-link-form')->toArray(); - } + $operations['add'] = array( + 'title' => t('Add link'), + 'weight' => 20, + ) + $entity->urlInfo('add-link-form')->toArray(); } if (isset($operations['delete'])) { $operations['delete']['title'] = t('Delete menu');