Skip to content

GitLab

D
drupal
Commit f69437de authored by Steven Wittens's avatar Steven Wittens
Browse files
Options

#12363: Bug in user_access() with uid 1 and $account parameter.

parent 29b32eff
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/user.module
View file @ f69437de
......@@ -307,15 +307,15 @@ function user_access($string, $account = NULL) {
global $user;
static $perm = array();
if (is_null($account)) {
$account = $user;
}
// User #1 has all privileges:
if ($user->uid == 1) {
return 1;
}
if (is_null($account)) {
$account = $user;
}
// To reduce the number of SQL queries, we cache the user's permissions
// in a static variable.
if (!isset($perm[$account->uid])) {
......
modules/user/user.module
View file @ f69437de
......@@ -307,15 +307,15 @@ function user_access($string, $account = NULL) {
global $user;
static $perm = array();
if (is_null($account)) {
$account = $user;
}
// User #1 has all privileges:
if ($user->uid == 1) {
return 1;
}
if (is_null($account)) {
$account = $user;
}
// To reduce the number of SQL queries, we cache the user's permissions
// in a static variable.
if (!isset($perm[$account->uid])) {
......
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