Reverting #163458
parent
a52ca1ab00
commit
47bc80c02f
|
@ -364,7 +364,7 @@ function user_access($string, $account = NULL) {
|
||||||
|
|
||||||
// To reduce the number of SQL queries, we cache the user's permissions
|
// To reduce the number of SQL queries, we cache the user's permissions
|
||||||
// in a static variable.
|
// in a static variable.
|
||||||
if (is_array($account->roles) && !isset($perm[$account->uid])) {
|
if (!isset($perm[$account->uid])) {
|
||||||
$result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN (%s)", implode(',', array_keys($account->roles)));
|
$result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN (%s)", implode(',', array_keys($account->roles)));
|
||||||
|
|
||||||
$perm[$account->uid] = '';
|
$perm[$account->uid] = '';
|
||||||
|
|
Loading…
Reference in New Issue