diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-07-25 13:50:46 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-07-25 13:50:46 +0200 |
| commit | 4c773891d738c732f525030aa1d0dd187c4221ec (patch) | |
| tree | 8065313e401b8017a6e86420d6eeb4e8076e4490 /core/Controller/NavigationController.php | |
| parent | 8e81bc78951a7e47ec840dab6b250f191537b4c5 (diff) | |
| download | nextcloud-server-4c773891d738c732f525030aa1d0dd187c4221ec.tar.gz nextcloud-server-4c773891d738c732f525030aa1d0dd187c4221ec.zip | |
Fix app navigation controller to return an array
This is required to not break compatibility with existing consumers of that endpoint like the apps management or the client
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/Controller/NavigationController.php')
| -rw-r--r-- | core/Controller/NavigationController.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php index 2397fb3c7b4..eb3b0968da3 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -55,7 +55,7 @@ class NavigationController extends OCSController { if ($absolute) { $navigation = $this->rewriteToAbsoluteUrls($navigation); } - + $navigation = array_values($navigation); $etag = $this->generateETag($navigation); if ($this->request->getHeader('If-None-Match') === $etag) { return new DataResponse([], Http::STATUS_NOT_MODIFIED); @@ -77,6 +77,7 @@ class NavigationController extends OCSController { if ($absolute) { $navigation = $this->rewriteToAbsoluteUrls($navigation); } + $navigation = array_values($navigation); $etag = $this->generateETag($navigation); if ($this->request->getHeader('If-None-Match') === $etag) { return new DataResponse([], Http::STATUS_NOT_MODIFIED); |