- Patch #28826 by chx: make xmlrpc_multicall working.

1 files changed, 4 insertions, 2 deletions

diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index 49023b942..91cfdbcc4 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -55,6 +55,7 @@ function xmlrpc_server($callbacks) {
   if ($xmlrpc_server->message->messagetype != 'methodCall') {
     xmlrpc_server_error(-32600, t('server error. invalid xml-rpc. not conforming to spec. Request must be a method_call'));
   }
+  xmlrpc_server_set($xmlrpc_server);
   $result = xmlrpc_server_call($xmlrpc_server, $xmlrpc_server->message->methodname, $xmlrpc_server->message->params);
   // Is the result an error?
   if ($result->is_error) {
@@ -114,9 +115,10 @@ function xmlrpc_server_get() {
   return xmlrpc_server_set();
 }
 
-function xmlrpc_server_multicall($xmlrpc_server, $methodcalls) {
+function xmlrpc_server_multicall($methodcalls) {
   // See http://www.xmlrpc.com/discuss/msgReader$1208
   $return = array();
+  $xmlrpc_server = xmlrpc_server_get();
   foreach ($methodcalls as $call) {
     $method = $call['methodName'];
     $params = $call['params'];
@@ -131,7 +133,7 @@ function xmlrpc_server_multicall($xmlrpc_server, $methodcalls) {
         'faultString' => $result->message
       );
     } else {
-      $return[] = array($result);
+      $return[] = $result;
     }
   }
   return $return;