Fix URL building

danmichaelo · danmichaelo · commit 1f7b118be7dc · 2018-08-03T16:37:36.000+02:00
diff --git a/src/Client.php b/src/Client.php
@@ -193,9 +193,10 @@ public function setRegion($regionCode)
      */
     protected function buildUrl($url, $query = [])
     {
-        $url = explode('?', $url, 1);
+        $url = explode('?', $url, 2);
         if (count($url) == 2) {
-            $query = array_merge($url[1], $query);
+            parse_str($url[1], $query0);
+            $query = array_merge($query0, $query);
         }
         $query['apikey'] = $this->key;
 

Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,10 @@ public function setRegion($regionCode)`
`193`	`193`	`*/`
`194`	`194`	`protected function buildUrl($url, $query = [])`
`195`	`195`	`{`
`196`		`- $url = explode('?', $url, 1);`
	`196`	`+ $url = explode('?', $url, 2);`
`197`	`197`	`if (count($url) == 2) {`
`198`		`- $query = array_merge($url[1], $query);`
	`198`	`+ parse_str($url[1], $query0);`
	`199`	`+ $query = array_merge($query0, $query);`
`199`	`200`	`}`
`200`	`201`	`$query['apikey'] = $this->key;`
`201`	`202`