diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index 92f5701..6c5527b 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -184,7 +184,7 @@ function _tracker_myrecent_access($account) { * @see tracker_menu() */ function _tracker_user_access($account) { - return user_view_access($account) && user_access('access content'); + return $account->access('view') && user_access('access content'); } /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php index 51fb108..4d6cd27 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php @@ -26,7 +26,7 @@ class LinkCancel extends Link { * Overrides \Drupal\user\Plugin\views\field\Link::render_link(). */ public function render_link(EntityInterface $entity, \stdClass $values) { - if ($entity && user_cancel_access($entity)) { + if ($entity && $entity->access('delete')) { $this->options['alter']['make_link'] = TRUE; $text = !empty($this->options['text']) ? $this->options['text'] : t('cancel'); diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php index 27909e4..82931c9 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php @@ -26,7 +26,7 @@ class LinkEdit extends Link { * Overrides \Drupal\user\Plugin\views\field\Link::render_link(). */ public function render_link(EntityInterface $entity, \stdClass $values) { - if ($entity && user_edit_access($entity)) { + if ($entity && $entity->access('edit')) { $this->options['alter']['make_link'] = TRUE; $text = !empty($this->options['text']) ? $this->options['text'] : t('edit'); diff --git a/core/modules/user/lib/Drupal/user/UserAccessController.php b/core/modules/user/lib/Drupal/user/UserAccessController.php index edeff44..f0202d0 100644 --- a/core/modules/user/lib/Drupal/user/UserAccessController.php +++ b/core/modules/user/lib/Drupal/user/UserAccessController.php @@ -2,7 +2,7 @@ /** * @file - * Contains Drupal\user\UserAccessController. + * Contains \Drupal\user\UserAccessController. */ namespace Drupal\user; diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 67ff04c..b0cf3f5 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -5,6 +5,7 @@ use Drupal\file\Plugin\Core\Entity\File; use Drupal\Core\Template\Attribute; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Drupal\user\Plugin\Core\Entity\User; /** * @file @@ -975,23 +976,26 @@ function user_register_access() { /** * User view access callback. * - * @param $account - * Can either be a full user object or a $uid. + * @param \Drupal\user\Plugin\Core\Entity\User $account + * Account to check view access against. + * + * @return bool + * TRUE if permission to view given account is granted, otherwise FALSE. */ -function user_view_access($account) { - if (is_numeric($account)) { - $account = user_load($account); - } +function user_view_access(User $account) { return $account->access('view'); } /** * Access callback for user account editing. + * + * @param \Drupal\user\Plugin\Core\Entity\User $account + * Account to check edit access against. + * + * @return bool + * TRUE if permission to edit given account is granted, otherwise FALSE. */ -function user_edit_access($account) { - if (is_numeric($account)) { - $account = user_load($account); - } +function user_edit_access(User $account) { return $account->access('update'); } @@ -1000,11 +1004,14 @@ function user_edit_access($account) { * * Limit access to users with the 'cancel account' permission or administrative * users, and prevent the anonymous user from cancelling the account. + * + * @param \Drupal\user\Plugin\Core\Entity\User $account + * Account to check cancel access against. + * + * @return bool + * TRUE if permission to cancel given account is granted, otherwise FALSE. */ -function user_cancel_access($account) { - if (is_numeric($account)) { - $account = user_load($account); - } +function user_cancel_access(User $account) { return $account->access('delete'); } @@ -2888,7 +2895,7 @@ function user_rdf_mapping() { */ function user_file_download_access($field, EntityInterface $entity, File $file) { if ($entity->entityType() == 'user') { - return user_view_access($entity); + return $entity->access('view'); } }