diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2022-08-25 09:55:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 09:55:39 +0200 |
| commit | 711a9fd209cafeee973c1f0c0924e974ffbe53f5 (patch) | |
| tree | 2cedd6d3e163a91d853f313de4fecd8fc1cf7f53 | |
| parent | 06340b6672ea8019e8dc9fff5e87d2edb8a3ac17 (diff) | |
| parent | 9f9da2eaa8a7b35fed04d9e676f30495e1a11263 (diff) | |
| download | nextcloud-server-711a9fd209cafeee973c1f0c0924e974ffbe53f5.tar.gz nextcloud-server-711a9fd209cafeee973c1f0c0924e974ffbe53f5.zip | |
Merge pull request #33682 from nextcloud/fix/noid/help-page-unavailable
Fix opening Help page throwing Exception
| -rw-r--r-- | apps/settings/lib/Controller/HelpController.php | 2 | ||||
| -rw-r--r-- | lib/private/URLGenerator.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php index 8a62fb9b58c..b8780ae40ba 100644 --- a/apps/settings/lib/Controller/HelpController.php +++ b/apps/settings/lib/Controller/HelpController.php @@ -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']); diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index 6115d4a221e..7be2895a1ef 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -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) { |