Url: Trim all leading slashes from paths, not just the first

refs #3829
This commit is contained in:
Johannes Meyer 2019-06-25 09:18:15 +02:00
parent 3f2a2fa984
commit dd664aab98
1 changed files with 2 additions and 2 deletions

View File

@ -191,11 +191,11 @@ class Url
$urlPath = $urlParts['path'];
if ($urlPath && $urlPath[0] === '/') {
if ($urlObject->isExternal() || isset($urlParts['user'])) {
$urlPath = substr($urlPath, 1);
$urlPath = ltrim($urlPath, '/');
} else {
$requestBaseUrl = $request->getBaseUrl();
if ($requestBaseUrl && $requestBaseUrl !== '/' && strpos($urlPath, $requestBaseUrl) === 0) {
$urlPath = substr($urlPath, strlen($requestBaseUrl) + 1);
$urlPath = ltrim(substr($urlPath, strlen($requestBaseUrl)), '/');
$urlObject->setBasePath($requestBaseUrl);
}
}