Fix array_key_exists error when creating a new user

ticktackk · Jul 25, 2020 · 6e6307d · 6e6307d
1 parent 692efd7
commit 6e6307d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/XF/PermissionSet.php b/XF/PermissionSet.php
@@ -25,6 +25,11 @@ public function hasGlobalPermission($group, $permission)
         $permissionCombinationId = $this->getPermissionCombinationId();
         $permissions = $permissionCache->getGlobalPerms($permissionCombinationId);
 
+        if (!$permissions)
+        {
+            return false;
+        }
+
         $groupEscaped = \XF::escapeString($group);
         $permissionEscaped = \XF::escapeString($permission);
 
@@ -37,11 +42,6 @@ public function hasGlobalPermission($group, $permission)
             $this->logPermissionError("Permission '$permissionEscaped' is unknown in '$groupEscaped' permission group");
         }
 
-        if (!$permissions || !isset($permissions[$group][$permission]))
-        {
-            return false;
-        }
-
         return $permissions[$group][$permission];
     }