Commit 53b024db authored by alexpott's avatar alexpott

Issue #2306429 by KarlKedrovsky, a_thakur: Remove user_access().

parent 447cfbf1
......@@ -416,32 +416,6 @@ function _user_role_permissions_update($roles) {
return $role_permissions;
}
/**
* Determine whether the user has a given privilege.
*
* @param $string
* The permission, such as "administer nodes", being checked for.
* @param \Drupal\Core\Session\AccountInterface $account
* (optional) The account to check, if not given use currently logged in user.
*
* @return bool
* Boolean TRUE if the current user has the requested permission.
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
* Use \Drupal\Core\Session\AccountInterface::hasPermission().
*/
function user_access($string, AccountInterface $account = NULL) {
global $user;
if (!isset($account)) {
// In the installer request session is not set, so we have to fall back
// to the global $user. In all other cases the session key is preferred.
$account = \Drupal::currentUser() ?: $user;
}
return $account->hasPermission($string);
}
/**
* Checks for usernames blocked by user administration.
*
......
......@@ -203,7 +203,7 @@ public function routingTableDefinition() {
'default' => '',
),
'access_callback' => array(
'description' => 'The callback which determines the access to this router path. Defaults to user_access.',
'description' => 'The callback which determines the access to this router path. Defaults to \Drupal\Core\Session\AccountInterface::hasPermission.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment