diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2020-01-20 13:50:23 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2020-01-20 13:51:12 +0000 |
| commit | 74509eb4e0f8b1c511c99c29000f1396db4b8819 (patch) | |
| tree | ca89b9dd5ba781135d3d289088bfca75b3d99a80 /community/nextcloud/use-external-docs-if-local-not-avail.patch | |
| parent | adf8c5b20d25e6577523c6419f09708343b65a7a (diff) | |
| download | aports-74509eb4e0f8b1c511c99c29000f1396db4b8819.tar.bz2 aports-74509eb4e0f8b1c511c99c29000f1396db4b8819.tar.xz | |
community/nextcloud: upgrade to 18.0.0
Diffstat (limited to 'community/nextcloud/use-external-docs-if-local-not-avail.patch')
| -rw-r--r-- | community/nextcloud/use-external-docs-if-local-not-avail.patch | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/community/nextcloud/use-external-docs-if-local-not-avail.patch b/community/nextcloud/use-external-docs-if-local-not-avail.patch index 19145b5ce1..62b60117a8 100644 --- a/community/nextcloud/use-external-docs-if-local-not-avail.patch +++ b/community/nextcloud/use-external-docs-if-local-not-avail.patch @@ -2,49 +2,8 @@ From: Jakub Jirutka <jakub@jirutka.cz> Date: Tue, 27 Jun 2017 02:07:00 +0200 Subject: [PATCH] Show link to external docs if local is not installed ---- a/settings/help.php -+++ b/settings/help.php -@@ -34,22 +34,36 @@ - OC_Util::addStyle( "settings", "settings" ); - \OC::$server->getNavigationManager()->setActiveEntry('help'); - -+$localDocs = true; - - if(isset($_GET['mode']) and $_GET['mode'] === 'admin') { -- $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); -+ if (file_exists(\OC::$SERVERROOT . '/core/doc/admin/index.html')) { -+ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); -+ } else { -+ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('admin-manual'); -+ $localDocs=false; -+ } - $style1=''; - $style2=' active'; - }else{ - $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); -+ if (file_exists( \OC::$SERVERROOT . '/core/doc/user/index.html' )) { -+ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); -+ } else { -+ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('user-manual'); -+ $localDocs=false; -+ } - $style1=' active'; - $style2=''; - } - -+ - $url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user'; - $url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin'; - - $tmpl = new OC_Template( "settings", "help", "user" ); - $tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser())); -+$tmpl->assign( "localDocs", $localDocs ); - $tmpl->assign( "url", $url ); - $tmpl->assign( "url1", $url1 ); - $tmpl->assign( "url2", $url2 ); - ---- a/settings/templates/help.php -+++ b/settings/templates/help.php +--- a/apps/settings/templates/help.php ++++ b/apps/settings/templates/help.php @@ -42,6 +42,17 @@ </div> |