diff --git a/core/modules/menu/lib/Drupal/menu/Access/DeleteMenuAccessCheck.php b/core/modules/menu/lib/Drupal/menu/Access/DeleteMenuAccessCheck.php deleted file mode 100644 index ef00dd0..0000000 --- a/core/modules/menu/lib/Drupal/menu/Access/DeleteMenuAccessCheck.php +++ /dev/null @@ -1,37 +0,0 @@ -getRequirements()); - } - - /** - * {@inheritdoc} - */ - public function access(Route $route, Request $request) { - if (user_access('administer menu') && $menu = $request->attributes->get('menu')) { - // System-defined menus may not be deleted. - $system_menus = menu_list_system_menus(); - return !isset($system_menus[$menu->id()]); - } - return FALSE; - } -} diff --git a/core/modules/menu/lib/Drupal/menu/MenuAccessController.php b/core/modules/menu/lib/Drupal/menu/MenuAccessController.php new file mode 100644 index 0000000..056a2d9 --- /dev/null +++ b/core/modules/menu/lib/Drupal/menu/MenuAccessController.php @@ -0,0 +1,34 @@ +id()]); + } + return user_access('administer menu', $account); + } + +} diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml index b67a709..7b651b5 100644 --- a/core/modules/menu/menu.routing.yml +++ b/core/modules/menu/menu.routing.yml @@ -24,4 +24,4 @@ menu_delete_menu: defaults: _form: '\Drupal\menu\Form\MenuDeleteMenuForm' requirements: - _access_menu_delete_menu: 'TRUE' + _entity_access: menu.delete diff --git a/core/modules/menu/menu.services.yml b/core/modules/menu/menu.services.yml deleted file mode 100644 index 2f94111..0000000 --- a/core/modules/menu/menu.services.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - access_check.menu.delete_menu: - class: Drupal\menu\Access\DeleteMenuAccessCheck - tags: - - { name: access_check }