upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(apporder): Load custom app order before resolving closures

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2026-03-15 15:31:40 +01:00
parent 27ec3e8a81
commit 7a1c67fc20
No known key found for this signature in database
GPG key ID: F72FA5B49FFA96B0
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/NavigationManager.php
View file

@ -47,7 +47,7 @@ class NavigationManager implements INavigationManager {
/** @var IConfig */
private $config;
/** User defined app order (cached for the `add` function) */
private array $customAppOrder;
private ?array $customAppOrder = null;
private LoggerInterface $logger;
public function __construct(
@ -209,6 +209,15 @@ class NavigationManager implements INavigationManager {
}
private function init(bool $resolveClosures = true): void {
if ($this->customAppOrder === null) {
if ($this->userSession->isLoggedIn()) {
$user = $this->userSession->getUser();
$this->customAppOrder = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR);
} else {
$this->customAppOrder = [];
}
}
if ($resolveClosures) {
while ($c = array_pop($this->closureEntries)) {
$this->add($c());
@ -329,10 +338,8 @@ class NavigationManager implements INavigationManager {
if ($this->userSession->isLoggedIn()) {
$user = $this->userSession->getUser();
$apps = $this->appManager->getEnabledAppsForUser($user);
$this->customAppOrder = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR);
} else {
$apps = $this->appManager->getEnabledApps();
$this->customAppOrder = [];
}
foreach ($apps as $app) {