mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate static methods and use Navigation manager 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-02-09 08:42:27 +01:00
parent 39529851a8
commit ada5aed35e
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/TemplateLayout.php
View File

@ -80,9 +80,9 @@ class TemplateLayout extends \OC_Template {
// Add navigation entry
$this->assign( 'application', '');
$this->assign( 'appid', $appId );
$navigation = \OC_App::getNavigation();
$navigation = \OC::$server->getNavigationManager()->getAll();
$this->assign( 'navigation', $navigation);
$settingsNavigation = \OC_App::getSettingsNavigation();
$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
$this->assign( 'settingsnavigation', $settingsNavigation);
foreach($navigation as $entry) {
if ($entry['active']) {

2
lib/private/legacy/app.php
View File

@ -586,6 +586,7 @@ class OC_App {
* Returns the navigation
*
* @return array
* @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll()
*
* This function returns an array containing all entries added. The
* entries are sorted by the key 'order' ascending. Additional to the keys
@ -600,6 +601,7 @@ class OC_App {
* Returns the Settings Navigation
*
* @return string[]
* @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll('settings')
*
* This function returns an array containing all settings pages added. The
* entries are sorted by the key 'order' ascending.

2
settings/ajax/navigationdetect.php
View File

@ -23,6 +23,6 @@
OC_Util::checkAdminUser();
OCP\JSON::callCheck();
$navigation = \OC_App::getNavigation();
$navigation = \OC::$server->getNavigationManager()->getAll();
OCP\JSON::success(['nav_entries' => $navigation]);