diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php index d322a64..5f5d22e 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php @@ -59,7 +59,7 @@ function testRoleAdministration() { // Test deleting a role. $this->drupalPost("admin/people/roles/edit/{$role->id()}", NULL, t('Delete role')); $this->drupalPost(NULL, NULL, t('Delete')); - $this->assertText(t('The role has been deleted.'), 'The role has been deleted'); + $this->assertText(t('The role %name has been deleted.', array('%name' => $role->label())), 'The role has been deleted'); $this->assertNoLinkByHref("admin/people/roles/edit/{$role->id()}", 'Role edit link removed.'); $this->assertFalse(entity_load('user_role', $role_name), 'A deleted role can no longer be loaded.'); diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 21891ec..940e0f5 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -974,11 +974,6 @@ function user_menu() { ); $items['admin/people/roles/delete/%user_role'] = array( 'title' => 'Delete role', -// 'page callback' => 'drupal_get_form', -// 'page arguments' => array('user_admin_role_delete_confirm', 4), -// 'access callback' => 'user_role_delete_access', -// 'access arguments' => array(4), -// 'file' => 'user.admin.inc', 'route_name' => 'user_role_delete', ); diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml index e4a087b..3061942 100644 --- a/core/modules/user/user.routing.yml +++ b/core/modules/user/user.routing.yml @@ -25,4 +25,3 @@ user_role_delete: _form: '\Drupal\user\Form\UserRoleDelete' requirements: _access_role_delete: 'TRUE' - _permission: 'administer permissions'