Merge branch '1.3' into 2.1

Author: lukmzig

src/Service/Permission/UserPermissionService.php

@@ -32,11 +32,7 @@ public function hasPermission(User $user, string $permission): bool
         if ($user->isAdmin()) {
             return true;
         }
-        $permissions = $user->getPermissions();
-        if (in_array($permission, $permissions)) {
-            return true;
-        }
 
-        return false;
+        return $user->isAllowed($permission);
     }
 }