diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-25 14:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 14:11:49 +0200 |
| commit | 70fa73404f9de1545e9907668a9369346cc66507 (patch) | |
| tree | 0ff605b97af1caa819c558bc06f77b67f09439a6 /core/Controller | |
| parent | ebeaa37da26e55e5511e080a0d827715e32146fe (diff) | |
| parent | 4c773891d738c732f525030aa1d0dd187c4221ec (diff) | |
| download | nextcloud-server-70fa73404f9de1545e9907668a9369346cc66507.tar.gz nextcloud-server-70fa73404f9de1545e9907668a9369346cc66507.zip | |
Merge pull request #10391 from nextcloud/bugfix/10389/fix-app-navigation-controller
Fix app navigation controller to return an array
Diffstat (limited to 'core/Controller')
| -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); |