[icinga-checkins] icinga.org: icingaweb2/master: Url: Return basePath in method getBaseUrl if url is internal

git at icinga.org git at icinga.org
Thu Oct 20 09:31:14 CEST 2016


Module: icingaweb2
Branch: master
Commit: 4dd9c05882814be1821735e98757d46783446dd8
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=4dd9c05882814be1821735e98757d46783446dd8

Author: Noah Hilverling <noah.hilverling at netways.de>
Date:   Tue Oct 18 12:26:59 2016 +0200

Url: Return basePath in method getBaseUrl if url is internal

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 28290e2..4667852 100644
--- a/library/Icinga/Web/Url.php
+++ b/library/Icinga/Web/Url.php
@@ -412,7 +412,7 @@ class Url
     public function getBaseUrl()
     {
         if (!$this->isExternal()) {
-            return '';
+            return $this->getBasePath();
         }
 
         return $this->getScheme() . '://' . $this->getHost() . ($this->getPort() ? (':' . $this->getPort()) : '');



More information about the icinga-checkins mailing list