Ensure URI parameters remain relative to subfolders

MGatner · MGatner · commit 024bedf19df8 · 2020-02-18T15:33:19.000-05:00
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -106,6 +106,7 @@ function base_url($uri = '', string $protocol = null): string
 		{
 			$uri = implode('/', $uri);
 		}
+		$uri = trim($uri, '/');
 
 		// We should be using the configured baseURL that the user set;
 		// otherwise get rid of the path, because we have

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ function base_url($uri = '', string $protocol = null): string`
`106`	`106`	`{`
`107`	`107`	`$uri = implode('/', $uri);`
`108`	`108`	`}`
	`109`	`+ $uri = trim($uri, '/');`
`109`	`110`
`110`	`111`	`// We should be using the configured baseURL that the user set;`
`111`	`112`	`// otherwise get rid of the path, because we have`