diff core/modules/user/src/ProfileForm.php @ 18:af1871eacc83

Update to Drupal core 8.7.1

--- a/core/modules/user/src/ProfileForm.php	Thu Feb 28 13:21:36 2019 +0000
+++ b/core/modules/user/src/ProfileForm.php	Thu May 09 15:33:08 2019 +0100
@@ -20,12 +20,10 @@
     // The user account being edited.
     $account = $this->entity;
 
-    // The user doing the editing.
-    $user = $this->currentUser();
     $element['delete']['#type'] = 'submit';
     $element['delete']['#value'] = $this->t('Cancel account');
     $element['delete']['#submit'] = ['::editCancelSubmit'];
-    $element['delete']['#access'] = $account->id() > 1 && (($account->id() == $user->id() && $user->hasPermission('cancel account')) || $user->hasPermission('administer users'));
+    $element['delete']['#access'] = $account->id() > 1 && $account->access('delete');
 
     return $element;
   }