mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow empty strings in getAbsoluteURL 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-11-20 13:28:07 +01:00
parent 2b18b9ae96
commit b8fcf6e9b3
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/URLGenerator.php
View File

@ -237,13 +237,13 @@ class URLGenerator implements IURLGenerator {
* @return string the absolute version of the url * @return string the absolute version of the url
*/ */
public function getAbsoluteURL(string $url): string { public function getAbsoluteURL(string $url): string {
$separator = $url[0] === '/' ? '' : '/'; $separator = strpos($url, '/') === 0 ? '' : '/';
if (\OC::$CLI && !\defined('PHPUNIT_RUN')) { if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/'); return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
} }
// The ownCloud web root can already be prepended. // The ownCloud web root can already be prepended.
if(substr($url, 0, \strlen(\OC::$WEBROOT)) === \OC::$WEBROOT) { if(\OC::$WEBROOT !== '' && strpos($url, \OC::$WEBROOT) === 0) {
$url = substr($url, \strlen(\OC::$WEBROOT)); $url = substr($url, \strlen(\OC::$WEBROOT));
} }

2
tests/lib/UrlGeneratorTest.php
View File

@ -145,6 +145,8 @@ class UrlGeneratorTest extends \Test\TestCase {
public function provideSubDirURLs() { public function provideSubDirURLs() {
return [ return [
['', 'http://localhost/nextcloud/'],
['/', 'http://localhost/nextcloud/'],
['index.php', 'http://localhost/nextcloud/index.php'], ['index.php', 'http://localhost/nextcloud/index.php'],
['/index.php', 'http://localhost/nextcloud/index.php'], ['/index.php', 'http://localhost/nextcloud/index.php'],
['/apps/index.php', 'http://localhost/nextcloud/apps/index.php'], ['/apps/index.php', 'http://localhost/nextcloud/apps/index.php'],