host/julienmonnerie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Composer packages

Browse source
This commit is contained in:
Paul Nicoué 2022-12-19 14:56:05 +01:00
parent 0320235f6c
commit a8b68fb61b
378 changed files with 28466 additions and 28852 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;
}