From 53b024dbd88a53ca6055cdc8e62c4c0107b16044 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 21 Jul 2014 12:42:10 +0100
Subject: [PATCH] Issue #2306429 by KarlKedrovsky, a_thakur: Remove
user_access().
---
core/modules/user/user.module | 26 -------------------
.../Tests/Core/Routing/RoutingFixtures.php | 2 +-
2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index cbb1b2da3a18..9209a39ceb16 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -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.
*
diff --git a/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php b/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
index 48071ae6b321..ffbfb0369b41 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
@@ -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,
--
GitLab