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

Fix opening Help page throwing Exception
nextcloud · Aug 25, 2022 · 711a9fd · 711a9fd
2 parents 06340b6 + 9f9da2e
commit 711a9fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php
@@ -79,7 +79,7 @@ public function help(string $mode = 'user'): TemplateResponse {
 		}
 
 		$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
@@ -146,7 +146,7 @@ public function linkTo(string $appName, string $file, array $args = []): string
 		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) {