Convert full URIs

MGatner · MGatner · commit 1034e69c5eb9 · 2021-05-13T01:43:20.000Z
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -42,9 +42,12 @@ function _get_uri(string $relativePath = '', App $config = null): URI
 		{
 			throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');
 		}
+
+		// If a full URI was passed then convert it
 		if (is_int(strpos($relativePath, '://')))
 		{
-			throw new InvalidArgumentException('_get_uri() only accepts relative paths.');
+			$full         = new URI($relativePath);
+			$relativePath = URI::createURIString(null, null, $full->getPath(), $full->getQuery(), $full->getFragment());
 		}
 
 		$relativePath = URI::removeDotSegments($relativePath);

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,12 @@ function _get_uri(string $relativePath = '', App $config = null): URI`
`42`	`42`	`{`
`43`	`43`	`throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ // If a full URI was passed then convert it`
`45`	`47`	`if (is_int(strpos($relativePath, '://')))`
`46`	`48`	`{`
`47`		`- throw new InvalidArgumentException('_get_uri() only accepts relative paths.');`
	`49`	`+ $full = new URI($relativePath);`
	`50`	`+ $relativePath = URI::createURIString(null, null, $full->getPath(), $full->getQuery(), $full->getFragment());`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`$relativePath = URI::removeDotSegments($relativePath);`