diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-03-26 21:15:25 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-03-26 21:15:25 +0200 |
| commit | e0b040d6235e7f8f8e5869e56a9bda1bf346cafd (patch) | |
| tree | 91bc197d3e598c49838635f2a6983e4aea9ab78f /apps | |
| parent | 7cc5130e8262b8e42df0c2a017cddcca2b6d8c85 (diff) | |
| download | nextcloud-server-e0b040d6235e7f8f8e5869e56a9bda1bf346cafd.tar.gz nextcloud-server-e0b040d6235e7f8f8e5869e56a9bda1bf346cafd.zip | |
Allow multiple navigation links from info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/appinfo/info.xml | 12 | ||||
| -rw-r--r-- | apps/files/lib/App.php | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 8b5678b331a..c49ec7aa407 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -55,10 +55,12 @@ <command>OCA\Files\Command\ScanAppData</command> </commands> - <navigation> - <name>Files</name> - <route>files.view.index</route> - <order>0</order> - </navigation> + <navigations> + <navigation> + <name>Files</name> + <route>files.view.index</route> + <order>0</order> + </navigation> + </navigations> </info> diff --git a/apps/files/lib/App.php b/apps/files/lib/App.php index 1aba2a53ef7..34d3ab4384c 100644 --- a/apps/files/lib/App.php +++ b/apps/files/lib/App.php @@ -48,7 +48,7 @@ class App { \OC::$server->getGroupManager(), \OC::$server->getConfig() ); - self::$navigationManager->noDefaultLinks(); + self::$navigationManager->clear(false); } return self::$navigationManager; } |