diff options
author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-05 04:24:18 +0300 |
---|---|---|
committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-05 04:24:18 +0300 |
commit | b06bc409e072343a69410283e1dcedfb5630572f (patch) | |
tree | be8f9ae7a70bbb689551000c7a815ff394cb8a0a /lib/private/app.php | |
parent | 7f8bca64cbb32df8eca313a886fd21e54fc24f13 (diff) |
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.
Diffstat (limited to 'lib/private/app.php')
-rw-r--r-- | lib/private/app.php | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index f1a1d27ae66..d5415834fa4 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -385,29 +385,6 @@ class OC_App { } /** - * Get the navigation entries for the $app - * - * @param string $app app - * @return array an array of the $data added with addNavigationEntry - * - * Warning: destroys the existing entries - */ - public static function getAppNavigationEntries($app) { - if (is_file(self::getAppPath($app) . '/appinfo/app.php')) { - OC::$server->getNavigationManager()->clear(); - try { - require $app . '/appinfo/app.php'; - } catch (\OC\Encryption\Exceptions\ModuleAlreadyExistsException $e) { - // FIXME we should avoid getting this exception in first place, - // For now we just catch it, since we don't care about encryption modules - // when trying to find out, whether the app has a navigation entry. - } - return OC::$server->getNavigationManager()->getAll(); - } - return array(); - } - - /** * gets the active Menu entry * * @return string id or empty string |