Merge pull request #58959 from nextcloud/bugfix/spreed-16678/load-custom-app-order-earlier

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

Author: nickvergessen

lib/private/NavigationManager.php

@@ -36,7 +36,7 @@ class NavigationManager implements INavigationManager {
 	protected array $unreadCounters = [];
 	protected bool $init = false;
 	/** User defined app order (cached for the `add` function) */
-	private array $customAppOrder;
+	private ?array $customAppOrder = null;
 
 	public function __construct(
 		protected IAppManager $appManager,
@@ -182,6 +182,15 @@ public function getActiveEntry(): ?string {
 	}
 
 	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());
@@ -302,10 +311,8 @@ private function init(bool $resolveClosures = true): void {
 		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) {