diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-09-19 00:19:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 00:19:19 +0200 |
| commit | 77321bc6cf21620a7e91803261cc827f63b01e28 (patch) | |
| tree | e408b7b1ecde494659f44a21e976258f077adb01 /lib | |
| parent | dd4caaff0c4eef64f0036a43d253abe579dddd0e (diff) | |
| parent | 71d870d1bdc11d5fe1a72f52e5f562b4bc4f2aa7 (diff) | |
| download | nextcloud-server-77321bc6cf21620a7e91803261cc827f63b01e28.tar.gz nextcloud-server-77321bc6cf21620a7e91803261cc827f63b01e28.zip | |
Merge pull request #47944 from nextcloud/backport/47883/stable30
[stable30] fix(setup-checks): Ensure URL with webroot works
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 2 | ||||
| -rw-r--r-- | lib/private/URLGenerator.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 4e66d389e7b..7654aef2b60 100644 --- a/lib/base.php +++ b/lib/base.php @@ -43,7 +43,7 @@ class OC { */ private static string $SUBURI = ''; /** - * the Nextcloud root path for http requests (e.g. nextcloud/) + * the Nextcloud root path for http requests (e.g. /nextcloud) */ public static string $WEBROOT = ''; /** diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index ab568a3296d..39b825e427b 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -245,7 +245,7 @@ class URLGenerator implements IURLGenerator { /** * Makes an URL absolute - * @param string $url the url in the ownCloud host + * @param string $url the url in the Nextcloud host * @return string the absolute version of the url */ public function getAbsoluteURL(string $url): string { @@ -254,7 +254,7 @@ class URLGenerator implements IURLGenerator { if (\OC::$CLI && !\defined('PHPUNIT_RUN')) { return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/'); } - // The ownCloud web root can already be prepended. + // The Nextcloud web root could already be prepended. if (\OC::$WEBROOT !== '' && str_starts_with($url, \OC::$WEBROOT)) { $url = substr($url, \strlen(\OC::$WEBROOT)); } |