From 1ff3149636d1551bd8c4d351963d61cf58a52d75 Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Wed, 19 Oct 2016 09:41:03 +0200 Subject: [PATCH] Url: Add basePath to urlString if url is external or has a username refs #12133 --- library/Icinga/Web/Url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php index 3f70bd3c1..d2cbf1dd0 100644 --- a/library/Icinga/Web/Url.php +++ b/library/Icinga/Web/Url.php @@ -609,7 +609,7 @@ class Url $urlString .= ':' . $this->getPort(); } - return $urlString . '/' . $path; + return $urlString . $basePath . ($basePath !== '/' && $path ? '/' : '') . $path; } else { return $basePath . ($basePath !== '/' && $path ? '/' : '') . $path; }