upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #33682 from nextcloud/fix/noid/help-page-unavailable

Browse source 
Fix opening Help page throwing Exception
This commit is contained in:
blizzz 2022-08-25 09:55:39 +02:00 committed by GitHub
commit 711a9fd209
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/settings/lib/Controller/HelpController.php
View file

@ -79,7 +79,7 @@ class HelpController extends Controller {
}
$documentationUrl = $this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkTo('core', 'doc/' . $mode . '/index.html')
$this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
);
$urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);

2
lib/private/URLGenerator.php
View file

@ -146,7 +146,7 @@ class URLGenerator implements IURLGenerator {
if ($appName !== '') {
$app_path = $this->getAppManager()->getAppPath($appName);
// Check if the app is in the app folder
if ($app_path && file_exists($app_path . '/' . $file)) {
if (file_exists($app_path . '/' . $file)) {
if (substr($file, -3) === 'php') {
$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
if ($frontControllerActive) {