X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2FServer.php;h=22808475a65a0583cd4b8efb9e364f1f52873235;hb=ee97067e0c7de2fc25a0834672f27dcad4468631;hp=40afa9bdfec62e70df34daf667556f691557e768;hpb=7ef47445e3dc236ef5fea0d3ea5bd0492a83d2a2;p=plcapi.git diff --git a/src/Server.php b/src/Server.php index 40afa9bd..22808475 100644 --- a/src/Server.php +++ b/src/Server.php @@ -457,8 +457,7 @@ class Server if (!in_array($reqEncoding, array('UTF-8', 'US-ASCII')) && !XMLParser::hasEncoding($data)) { if ($reqEncoding == 'ISO-8859-1') { $data = utf8_encode($data); - } - else { + } else { if (extension_loaded('mbstring')) { $data = mb_convert_encoding($data, 'UTF-8', $reqEncoding); } else { @@ -931,8 +930,9 @@ class Server // base64 or datetime values, but they will be listed as strings here... $numParams = count($call['params']); $pt = array(); + $wrapper = new Wrapper(); foreach ($call['params'] as $val) { - $pt[] = php_2_xmlrpc_type(gettype($val)); + $pt[] = $wrapper->php_2_xmlrpc_type(gettype($val)); } $result = $server->execute($call['methodName'], $call['params'], $pt);