Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable10] Backport of Remove bundled docs from community edition #34612

Merged
merged 1 commit into from
Feb 26, 2019
Merged

[stable10] Backport of Remove bundled docs from community edition #34612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions lib/private/legacy/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,20 +460,6 @@ public static function getSettingsNavigation() {
$urlGenerator = \OC::$server->getURLGenerator();

$settings = [];
// by default, settings only contain the help menu
if (OC_Util::getEditionString() === OC_Util::EDITION_COMMUNITY &&
\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
) {
$settings = [
[
"id" => "help",
"order" => 1000,
"href" => $urlGenerator->linkToRoute('settings_help'),
"name" => $l->t("Help"),
"icon" => $urlGenerator->imagePath("settings", "help.svg")
]
];
}

// if the user is logged-in
if (OC_User::isLoggedIn()) {
Expand Down
4 changes: 1 addition & 3 deletions settings/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,9 @@

/** @var $this \OCP\Route\IRouter */

// Settings pages
$this->create('settings_help', '/settings/help')
->actionInclude('settings/help.php');
$this->create('settings_users', '/settings/users')
->actionInclude('settings/users.php');

// Settings ajax actions
// users
$this->create('settings_ajax_setquota', '/settings/ajax/setquota.php')
Expand Down