Route: fixed PHP warning "strpos(): Offset not contained in string" (n…

…ette/application#154)
nette · Feb 3, 2019 · 8325d6f · 8325d6f
1 parent 827ad7c
commit 8325d6f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Routing/Route.php b/src/Routing/Route.php
@@ -389,6 +389,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 			}
 		} while (TRUE);
 
+		$scheme = $this->scheme ?: $refUrl->getScheme();
 
 		if ($this->type === self::HOST) {
 			$host = $refUrl->getHost();
@@ -400,18 +401,17 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 				'%sld%' => isset($parts[1]) ? $parts[1] : '',
 				'%host%' => $host,
 			]);
-			$url = ($this->scheme ?: $refUrl->getScheme()) . ':' . $url;
+			$url = $scheme . ':' . $url;
 		} else {
 			if ($this->lastRefUrl !== $refUrl) {
-				$scheme = ($this->scheme ?: $refUrl->getScheme());
 				$basePath = ($this->type === self::RELATIVE ? $refUrl->getBasePath() : '');
 				$this->lastBaseUrl = $scheme . '://' . $refUrl->getAuthority() . $basePath;
 				$this->lastRefUrl = $refUrl;
 			}
 			$url = $this->lastBaseUrl . $url;
 		}
 
-		if (strpos($url, '//', 7) !== FALSE) {
+		if (strpos($url, '//', strlen($scheme) + 3) !== FALSE) {
 			return NULL;
 		}