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

modules/user.module

@@ -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

@@ -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])) {