summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user.module2
-rw-r--r--modules/user/user.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module
index 12405d285..0a9d131e6 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -337,7 +337,7 @@ function user_access($string, $account = NULL) {
// To reduce the number of SQL queries, we cache the user's permissions
// in a static variable.
- if (!isset($perm[$account->uid]) && count($user->roles)) {
+ 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)));
$perm[$account->uid] = '';
diff --git a/modules/user/user.module b/modules/user/user.module
index 12405d285..0a9d131e6 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -337,7 +337,7 @@ function user_access($string, $account = NULL) {
// To reduce the number of SQL queries, we cache the user's permissions
// in a static variable.
- if (!isset($perm[$account->uid]) && count($user->roles)) {
+ 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)));
$perm[$account->uid] = '';