Always parse query string, on the main request or on sub-requests

Initial request will have the global $_GET re-applied in the `factory()` method.
kohana · Jul 21, 2016 · 91b3ec5 · 91b3ec5
1 parent 6f81f71
commit 91b3ec5
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php
@@ -667,13 +667,9 @@ public function __construct($uri, $client_params = array(), $allow_external = TR
 		$split_uri = explode('?', $uri);
 		$uri = array_shift($split_uri);
 
-		// Initial request has global $_GET already applied
-		if (Request::$initial === NULL)
+		if ($split_uri)
 		{
-			if ($split_uri)
-			{
-				parse_str($split_uri[0], $this->_get);
-			}
+			parse_str($split_uri[0], $this->_get);
 		}
 
 		// Detect protocol (if present)