Skip to content

Commit 0dc19ec

Browse files
authored
Merge pull request #19 from mmolle-nelo/master
[BUGFIX] fixed format_query() allows multi-dimensional parameter arrays
2 parents e543649 + 0253e0f commit 0dc19ec

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

restclient.php

+2-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* PHP REST Client
55
* https://github.com/tcdent/php-restclient
6-
* (c) 2013-2016 Travis Dent <[email protected]>
6+
* (c) 2013-2017 Travis Dent <[email protected]>
77
*/
88

99
class RestClientException extends Exception {}
@@ -160,7 +160,7 @@ public function execute($url, $method='GET', $parameters=[], $headers=[]){
160160
// merged with parameters specified in the default options.
161161
if(is_array($parameters)){
162162
$parameters = array_merge($client->options['parameters'], $parameters);
163-
$parameters_string = $client->format_query($parameters);
163+
$parameters_string = http_build_query($parameters);
164164
}
165165
else
166166
$parameters_string = (string) $parameters;
@@ -201,17 +201,6 @@ public function execute($url, $method='GET', $parameters=[], $headers=[]){
201201
return $client;
202202
}
203203

204-
public function format_query($parameters, $primary='=', $secondary='&'){
205-
$query = "";
206-
foreach($parameters as $key => $values){
207-
foreach(is_array($values)? $values : [$values] as $value){
208-
$pair = [urlencode($key), urlencode($value)];
209-
$query .= implode($primary, $pair) . $secondary;
210-
}
211-
}
212-
return rtrim($query, $secondary);
213-
}
214-
215204
public function parse_response($response){
216205
$headers = [];
217206
$this->response_status_lines = [];

0 commit comments

Comments
 (0)