Url: Fix detection of the current base url when stripping it from a g…

…iven path
Icinga · Oct 1, 2015 · 85e7e79 · 85e7e79
1 parent 5f7f0a9
commit 85e7e79
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php
@@ -161,9 +161,12 @@ public static function fromPath($url, array $params = array(), $request = null)
             if ($urlPath && $urlPath[0] === '/') {
                 if ($baseUrl) {
                     $urlPath = substr($urlPath, 1);
-                } elseif (strpos($urlPath, $request->getBaseUrl()) === 0) {
-                    $baseUrl = $request->getBaseUrl();
-                    $urlPath = substr($urlPath, strlen($baseUrl) + 1);
+                } else {
+                    $requestBaseUrl = $request->getBaseUrl();
+                    if ($requestBaseUrl && $requestBaseUrl !== '/' && strpos($urlPath, $requestBaseUrl) === 0) {
+                        $urlPath = substr($urlPath, strlen($requestBaseUrl) + 1);
+                        $baseUrl = $requestBaseUrl;
+                    }
                 }
             } elseif (! $baseUrl) {
                 $baseUrl = $request->getBaseUrl();

diff --git a/test/php/library/Icinga/Web/UrlTest.php b/test/php/library/Icinga/Web/UrlTest.php
@@ -158,17 +158,14 @@ public function testWhetherGetAbsoluteUrlReturnsTheAbsoluteUrl()
         );
     }
 
-    /**
-     * @depends testWhetherFromPathProperlyRecognizesAndDecodesQueryParameters
-     */
-    public function testWhetherGetRelativeUrlReturnsTheRelativeUrl()
+    public function testWhetherGetRelativeUrlReturnsTheEmptyStringForAbsoluteUrls()
     {
         $url = Url::fromPath('/my/test/url.html?param=val&param2=val2');
 
         $this->assertEquals(
-            'my/test/url.html?param=val&param2=val2',
+            '',
             $url->getRelativeUrl(),
-            'Url::getRelativeUrl does not return the relative url'
+            'Url::getRelativeUrl does not return the empty string for absolute urls'
         );
     }