summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-07 10:17:44 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-07 10:17:44 +0100
commitc9069d571166439687bc2c20f725d0c63862c228 (patch)
tree1c44602452ca10e657046b1cecdc0fb9ecff3aee /settings
parent884946276e13e7949cb2a5a46fd29d342ff386d4 (diff)
parent46a6c6d70bb3d66a129c247ce9d9e5b41c80c2ed (diff)
downloadnextcloud-server-c9069d571166439687bc2c20f725d0c63862c228.tar.gz
nextcloud-server-c9069d571166439687bc2c20f725d0c63862c228.zip
Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
Diffstat (limited to 'settings')
-rw-r--r--settings/admin.php2
-rw-r--r--settings/help.php2
-rw-r--r--settings/users.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php
index bccb1171743..ae4340cf14f 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -33,7 +33,7 @@
use OC\Lock\NoopLockingProvider;
OC_Util::checkAdminUser();
-OC_App::setActiveNavigationEntry("admin");
+\OC::$server->getNavigationManager()->setActiveEntry("admin");
$template = new OC_Template('settings', 'admin', 'user');
$l = \OC::$server->getL10N('settings');
diff --git a/settings/help.php b/settings/help.php
index aa89277d883..60719a3df92 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -30,7 +30,7 @@ OC_Util::checkLoggedIn();
// Load the files we need
OC_Util::addStyle( "settings", "settings" );
-OC_App::setActiveNavigationEntry( "help" );
+\OC::$server->getNavigationManager()->setActiveEntry('help');
if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
diff --git a/settings/users.php b/settings/users.php
index 2795032a161..ccf1bcd9e1a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -35,7 +35,7 @@
OC_Util::checkSubAdminUser();
-OC_App::setActiveNavigationEntry( 'core_users' );
+\OC::$server->getNavigationManager()->setActiveEntry('core_users');
$userManager = \OC_User::getManager();
$groupManager = \OC_Group::getManager();