From 305534225ea67f3e7fe655bdc4a1aa39e465cd13 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 02:08:56 +0200 Subject: [PATCH 1/2] Revert "Remove "Help" link from personal sidebar" This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779. --- lib/private/legacy/app.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 37ceea35ac043..9753e2efd506a 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -421,9 +421,7 @@ public static function getSettingsNavigation() { $settings = array(); // by default, settings only contain the help menu - /* - * FIXME: Add help sidebar back once documentation is properly branded. - if (OC_Util::getEditionString() === '' && + if (OC_Util::getEditionString() === '' && \OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true ) { $settings = array( @@ -435,7 +433,7 @@ public static function getSettingsNavigation() { "icon" => $urlGenerator->imagePath("settings", "help.svg") ) ); - }*/ + } // if the user is logged-in if (OC_User::isLoggedIn()) { From ed219169996f9cc01a9aed82d8722fb97f3df3ca Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 21 Jul 2016 02:10:28 +0200 Subject: [PATCH 2/2] Add proper links --- settings/templates/help.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/settings/templates/help.php b/settings/templates/help.php index 79584aba84d11..11726d60387f4 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -16,19 +16,19 @@
  • - + t('Online documentation')); ?> ↗
  • - + t('Forum')); ?> ↗
  • - t('Issue tracker')); ?> ↗ @@ -36,7 +36,7 @@
  • - + t('Commercial support')); ?> ↗