interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.8.0

Browse Source
This commit is contained in:
Bastian Allgeier
2022-10-06 10:11:54 +02:00
parent a9ed4e45ca
commit 7d168aae58
332 changed files with 26337 additions and 21977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kirby/src/Cms/UserRules.php
View File

@@ -179,14 +179,14 @@ class UserRules
$currentUser = $user->kirby()->user();
// admins are allowed everything
if ($currentUser && $currentUser->isAdmin() === true) {
if ($currentUser?->isAdmin() === true) {
return true;
}
// only admins are allowed to add admins
$role = $props['role'] ?? null;
if ($role === 'admin' && $currentUser && $currentUser->isAdmin() === false) {
if ($role === 'admin' && $currentUser?->isAdmin() === false) {
throw new PermissionException([
'key' => 'user.create.permission'
]);
@@ -358,7 +358,7 @@ class UserRules
*/
public static function validRole(User $user, string $role): bool
{
if (is_a($user->kirby()->roles()->find($role), 'Kirby\Cms\Role') === true) {
if ($user->kirby()->roles()->find($role) instanceof Role) {
return true;
}