- Patch #28826 by chx: make xmlrpc_multicall working.

1 files changed, 3 insertions, 9 deletions

diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index b8cbad4dd..412171717 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -120,9 +120,6 @@ function xmlrpc_message_parse(&$xmlrpc_message) {
   xml_set_character_data_handler($xmlrpc_message->_parser, 'xmlrpc_message_cdata');
   xmlrpc_message_set($xmlrpc_message);
   if (!xml_parse($xmlrpc_message->_parser, $xmlrpc_message->message)) {
-    /* die(sprintf('XML error: %s at line %d',
-      xml_error_string(xml_get_error_code($xmlrpc_message->_parser)),
-      xml_get_current_line_number($xmlrpc_message->_parser))); */
     return FALSE;
   }
   xml_parser_free($xmlrpc_message->_parser);
@@ -392,22 +389,19 @@ function xmlrpc() {
  *    An array of calls. Each call is an array, where the first element
  *    is the method name, further elements are the arguments.
  * @return
+ *    An array of results.
  */
 function xmlrpc_multicall() {
   $args = func_get_args();
   $url = $args[0];
-  $client = xmlrpc_client_multicall($url);
   foreach ($args[1] as $call) {
     $method = array_shift($call);
     $calls[] = array(
       'methodName' => $method,
-      'params' => $args
+      'params' => $call
     );
   }
-  $result = xmlrpc($url, 'system.multicall', $calls);
-//    $result = xmlrpc_client_multicall_query($client);
-//    $results[$method] = ($result === FALSE) ? xmlrpc_error() : $result;
-//    return $results;
+  return xmlrpc($url, 'system.multicall', $calls);
 }
 
 /**