Do not override a non-HTTP resource link with the base URL

pjcdawkins · pjcdawkins · commit a6636bdb0d81 · 2022-05-17T16:20:03.000+01:00
diff --git a/src/Model/Resource.php b/src/Model/Resource.php
@@ -612,7 +612,7 @@ protected function makeAbsoluteUrl($relativeUrl, $baseUrl = null)
         $base = Url::fromString($baseUrl);
         $target = Url::fromString($relativeUrl);
         // Ensure an absolute base URL overrides an absolute target URL.
-        if ($base->isAbsolute()) {
+        if ($base->isAbsolute() && \in_array($target->getScheme(), ['http', 'https'])) {
             return (string) $base->combine($target->getPath());
         }
         return (string) $base->combine($target);

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ protected function makeAbsoluteUrl($relativeUrl, $baseUrl = null)`
`612`	`612`	`$base = Url::fromString($baseUrl);`
`613`	`613`	`$target = Url::fromString($relativeUrl);`
`614`	`614`	`// Ensure an absolute base URL overrides an absolute target URL.`
`615`		`- if ($base->isAbsolute()) {`
	`615`	`+ if ($base->isAbsolute() && \in_array($target->getScheme(), ['http', 'https'])) {`
`616`	`616`	`return (string) $base->combine($target->getPath());`
`617`	`617`	`}`
`618`	`618`	`return (string) $base->combine($target);`