Ensure query vars are part of request->uri. Fixes #2062

lonnieezell · lonnieezell · commit f9dbfea0dd48 · 2019-06-19T23:20:41.000-05:00
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -595,6 +595,9 @@ protected function detectURI(string $protocol, string $baseURL)
 			$this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
 			$this->uri->setPort(parse_url($baseURL, PHP_URL_PORT));
 			$this->uri->resolveRelativeURI(parse_url($baseURL, PHP_URL_PATH));
+
+			// Ensure we have any query vars
+			$this->uri->setQuery($_SERVER['QUERY_STRING'] ?? '');
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -595,6 +595,9 @@ protected function detectURI(string $protocol, string $baseURL)`
`595`	`595`	`$this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));`
`596`	`596`	`$this->uri->setPort(parse_url($baseURL, PHP_URL_PORT));`
`597`	`597`	`$this->uri->resolveRelativeURI(parse_url($baseURL, PHP_URL_PATH));`
	`598`	`+`
	`599`	`+ // Ensure we have any query vars`
	`600`	`+ $this->uri->setQuery($_SERVER['QUERY_STRING'] ?? '');`
`598`	`601`	`}`
`599`	`602`	`else`
`600`	`603`	`{`