diff --git a/common/HttpClient.php b/common/HttpClient.php index 0723cbd..b43d72a 100644 --- a/common/HttpClient.php +++ b/common/HttpClient.php @@ -463,18 +463,17 @@ class HttpClient */ private function resolve($data, $body) { + $type = $data['Content-Type'] ?? $data['content-type']; if (is_array($body)) { return $body; } - $type = $data['Content-Type'] ?? $data['content-type']; if (strpos($type, 'json') !== false) { return json_decode($body, true); } else if (strpos($type, 'xml') !== false || strpos($type, 'plain') !== false) { if (!is_null($newBody = json_decode($body, true))) { return $newBody; } - $data = simplexml_load_string($body, 'SimpleXMLElement', LIBXML_NOCDATA); - return json_decode(json_encode($data), TRUE); + return Help::toArray($body); } else if (strpos($type, 'plain') !== false) { return json_decode($body, TRUE); } else {