Use groupHasPermission

Author: tadhgboyle

core/classes/Permissions/PermissionCalculator.php

@@ -32,17 +32,9 @@ public function userHasPermission(User $user, string $permission): bool
 
         if ($result === PermissionTristate::INHERIT) {
             foreach ($user->getGroups() as $group) {
-                $group_permissions = $this->_permission_cache->getOrLoad(Group::class, $group->id);
-
-                $result = $group_permissions[$permission] ?? PermissionTristate::INHERIT;
-
-                if ($result === PermissionTristate::TRUE) {
+                if ($this->groupHasPermission($group, $permission)) {
                     return true;
                 }
-
-                if ($result === PermissionTristate::FALSE) {
-                    return false;
-                }
             }
         }