diff options
| author | Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com> | 2024-06-05 14:53:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-05 14:53:59 +0200 |
| commit | 75d6cc518a3c01d8bdba230d567ca74c586b8c8c (patch) | |
| tree | 5867a31c8a5d0ca386ed53a5fc125a98532f2cf6 /lib | |
| parent | a62a1faf3b113ea8d1be54d088cab0214b0600d3 (diff) | |
| parent | bba54b55564dbf36c6602d6ebb4a7fe186f376c4 (diff) | |
| download | nextcloud-server-75d6cc518a3c01d8bdba230d567ca74c586b8c8c.tar.gz nextcloud-server-75d6cc518a3c01d8bdba230d567ca74c586b8c8c.zip | |
Merge pull request #45646 from nextcloud/backport/45455/stable28
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/NavigationManager.php | 2 | ||||
| -rw-r--r-- | lib/public/INavigationManager.php | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 17573d9db86..6808ab04c2c 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -118,7 +118,7 @@ class NavigationManager implements INavigationManager { // This is the default app that will always be shown first $entry['default'] = ($entry['app'] ?? false) === $this->defaultApp; // Set order from user defined app order - $entry['order'] = $this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100; + $entry['order'] = (int)($this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100); } $this->entries[$id] = $entry; diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index 36f80c3293f..d1e5e674ab0 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -33,12 +33,10 @@ namespace OCP; /** - * @psalm-type NavigationEntry = array{id: string, order: int, href: string, name: string, app?: string, icon?: string, classes?: string, type?: string} - */ - -/** * Manages the ownCloud navigation * @since 6.0.0 + * + * @psalm-type NavigationEntry = array{id: string, order: int, href: string, name: string, app?: string, icon?: string, classes?: string, type?: string} */ interface INavigationManager { /** |