Consistently cache accessibility by current role

getkirby · Dec 17, 2024 · c1eca90 · c1eca90
1 parent 99a7335
commit c1eca90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Cms/Language.php b/src/Cms/Language.php
@@ -307,7 +307,7 @@ public function exists(): bool
 	public function isAccessible(): bool
 	{
 		static $accessible = [];
-		$role = $this->kirby()->user()?->role()->id() ?? 'nobody';
+		$role = $this->kirby()->role()?->id() ?? '__none__';
 		return $accessible[$role] ??= $this->permissions()->can('access');
 	}
 

diff --git a/src/Cms/User.php b/src/Cms/User.php
@@ -287,7 +287,7 @@ public function is(User|null $user = null): bool
 	public function isAccessible(): bool
 	{
 		static $accessible = [];
-		$role = $this->role()->id();
+		$role = $this->kirby()->role()?->id() ?? '__none__';
 		return $accessible[$role] ??= $this->permissions()->can('access');
 	}