Route, SimpleRouter: fixed generating malformed URL without authority

nette · Feb 13, 2019 · 6e90be9 · 6e90be9
1 parent a4d8097
commit 6e90be9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Routing/Route.php b/src/Routing/Route.php
@@ -292,10 +292,10 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 
 		// absolutize path
 		if ($this->type === self::RELATIVE) {
-			$url = '//' . $refUrl->getAuthority() . $refUrl->getBasePath() . $url;
+			$url = (($tmp = $refUrl->getAuthority()) ? "//$tmp" : '') . $refUrl->getBasePath() . $url;
 
 		} elseif ($this->type === self::PATH) {
-			$url = '//' . $refUrl->getAuthority() . $url;
+			$url = (($tmp = $refUrl->getAuthority()) ? "//$tmp" : '') . $url;
 
 		} else {
 			$host = $refUrl->getHost();

diff --git a/src/Routing/SimpleRouter.php b/src/Routing/SimpleRouter.php
@@ -52,7 +52,7 @@ public function constructUrl(array $params, Nette\Http\UrlScript $refUrl): ?stri
 			}
 		}
 
-		$url = $refUrl->getScheme() . '://' . $refUrl->getAuthority() . $refUrl->getPath();
+		$url = $refUrl->getHostUrl() . $refUrl->getPath();
 		$sep = ini_get('arg_separator.input');
 		$query = http_build_query($params, '', $sep ? $sep[0] : '&');
 		if ($query != '') { // intentionally ==