Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App

diff --git a/lib/private/app.php b/lib/private/app.php
index c6e235eda4db1af80bb9fd4beacaec53aabf12c8..78b039b87f0b58f2e61fda72001928cffd3a18ea 100644 (file)
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -360,23 +360,6 @@ class OC_App {
                $appManager->disableApp($app);
        }
 
-       /**
-        * marks a navigation entry as active
-        *
-        * @param string $id id of the entry
-        * @return bool
-        *
-        * This function sets a navigation entry as active and removes the 'active'
-        * property from all other entries. The templates can use this for
-        * highlighting the current position of the user.
-        *
-        * @deprecated Use \OC::$server->getNavigationManager()->setActiveEntry() instead
-        */
-       public static function setActiveNavigationEntry($id) {
-               OC::$server->getNavigationManager()->setActiveEntry($id);
-               return true;
-       }
-
        /**
         * gets the active Menu entry
         *

diff --git a/lib/public/app.php b/lib/public/app.php
index c66d988c31580e4b2bcb64046f53e5e04754c7b4..cc41484262823182c6792b6c66f1e1841eefec73 100644 (file)
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -82,7 +82,8 @@ class App {
         * @since 4.0.0
         */
        public static function setActiveNavigationEntry( $id ) {
-               return \OC_App::setActiveNavigationEntry( $id );
+               \OC::$server->getNavigationManager()->setActiveEntry($id);
+               return true;
        }
 
        /**

diff --git a/settings/admin.php b/settings/admin.php
index bccb1171743bc82ee332d6220f6d5b098d5604d0..ae4340cf14f885fc8afc524324929224df3ad91d 100644 (file)
--- 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 aa89277d8833bf1f24b47203203f471ee47c9d5b..60719a3df923e1e9f3dfe05d1d986a5b21b927a9 100644 (file)
--- 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 2795032a1615939b09e2f52b3bb685ad941b6ae7..ccf1bcd9e1a8ca1f08d71154b100798a9fbd58ba 100644 (file)
--- 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();