Browse Source

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

tags/v9.0beta1
Morris Jobke 8 years ago
parent
commit
e6d4496fc2
5 changed files with 5 additions and 21 deletions
  1. 0
    17
      lib/private/app.php
  2. 2
    1
      lib/public/app.php
  3. 1
    1
      settings/admin.php
  4. 1
    1
      settings/help.php
  5. 1
    1
      settings/users.php

+ 0
- 17
lib/private/app.php View File

@@ -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
*

+ 2
- 1
lib/public/app.php View File

@@ -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;
}

/**

+ 1
- 1
settings/admin.php View File

@@ -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');

+ 1
- 1
settings/help.php View File

@@ -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') {

+ 1
- 1
settings/users.php View File

@@ -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();

Loading…
Cancel
Save