tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Url: Remove "/" in front of path if the url has a user parameter 

refs #12133
This commit is contained in:
Noah Hilverling 2016-10-18 16:07:13 +02:00
parent dda7311226
commit 1c55351460
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Web/Url.php
View File

@ -189,7 +189,7 @@ class Url
if (isset($urlParts['path'])) { if (isset($urlParts['path'])) {
$urlPath = $urlParts['path']; $urlPath = $urlParts['path'];
if ($urlPath && $urlPath[0] === '/') { if ($urlPath && $urlPath[0] === '/') {
if ($urlObject->isExternal()) { if ($urlObject->isExternal() || isset($urlParts['user'])) {
$urlPath = substr($urlPath, 1); $urlPath = substr($urlPath, 1);
} else { } else {
$requestBaseUrl = $request->getBaseUrl(); $requestBaseUrl = $request->getBaseUrl();
@ -198,12 +198,12 @@ class Url
$urlObject->setBasePath($requestBaseUrl); $urlObject->setBasePath($requestBaseUrl);
} }
} }
} elseif (!$urlObject->isExternal()) { } elseif (! $urlObject->isExternal()) {
$urlObject->setBasePath($request->getBaseUrl()); $urlObject->setBasePath($request->getBaseUrl());
} }
$urlObject->setPath($urlPath); $urlObject->setPath($urlPath);
} elseif (!$urlObject->isExternal()) { } elseif (! $urlObject->isExternal()) {
$urlObject->setBasePath($request->getBaseUrl()); $urlObject->setBasePath($request->getBaseUrl());
} }