Skip to content

Commit 8c5119c

Browse files
authored
[6.x] Apply default preferences when logged out (#13363)
1 parent fdf4d65 commit 8c5119c

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/Preferences/Preferences.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ public function preventMergingChildren($dottedKey)
4343
*/
4444
public function all()
4545
{
46-
if (auth()->guest()) {
47-
return [];
46+
$this->resetState();
47+
48+
if (auth()->check()) {
49+
$this
50+
->mergeDottedUserPreferences()
51+
->mergeDottedRolePreferences();
4852
}
4953

5054
return $this
51-
->resetState()
52-
->mergeDottedUserPreferences()
53-
->mergeDottedRolePreferences()
5455
->mergeDottedDefaultPreferences()
5556
->getMultiDimensionalPreferences();
5657
}

0 commit comments

Comments
 (0)