Rebuild app navigation in JS

Retrieve all app navigations to prevent reloading appinfo/app.php and
causing an error when the app isn't fully loaded. The addition/deletion
logic has been moved to JS, simplifying a lot of code.

1 files changed, 2 insertions, 10 deletions

diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index d7c1cbc5a12..abf04805d87 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -23,14 +23,6 @@
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-$app = (string)$_GET['app'];
-$app = OC_App::cleanAppId($app);
+$navigation = \OC::$server->getNavigationManager()->getAll();
 
-$navigation = OC_App::getAppNavigationEntries($app);
-
-$navIds = array();
-foreach ($navigation as $nav) {
-	$navIds[] = $nav['id'];
-}
-
-OCP\JSON::success(array('nav_ids' => array_values($navIds), 'nav_entries' => $navigation));
+OCP\JSON::success(['nav_entries' => $navigation]);