Commit 413fb434 authored by Dries's avatar Dries
Browse files

- Patch #677750 by jurgenhaas: fixed XMLRPC server call creates unnecessary watchdog entries.

parent fd4d0fd4
...@@ -75,7 +75,7 @@ function xmlrpc_server($callbacks) { ...@@ -75,7 +75,7 @@ function xmlrpc_server($callbacks) {
xmlrpc_server_set($xmlrpc_server); xmlrpc_server_set($xmlrpc_server);
$result = xmlrpc_server_call($xmlrpc_server, $xmlrpc_server->message->methodname, $xmlrpc_server->message->params); $result = xmlrpc_server_call($xmlrpc_server, $xmlrpc_server->message->methodname, $xmlrpc_server->message->params);
if ($result->is_error) { if (is_object($result) && !empty($result->is_error)) {
xmlrpc_server_error($result); xmlrpc_server_error($result);
} }
// Encode the result // Encode the result
...@@ -235,7 +235,7 @@ function xmlrpc_server_multicall($methodcalls) { ...@@ -235,7 +235,7 @@ function xmlrpc_server_multicall($methodcalls) {
elseif ($ok) { elseif ($ok) {
$result = xmlrpc_server_call($xmlrpc_server, $method, $params); $result = xmlrpc_server_call($xmlrpc_server, $method, $params);
} }
if ($result->is_error) { if (is_object($result) && !empty($result->is_error)) {
$return[] = array( $return[] = array(
'faultCode' => $result->code, 'faultCode' => $result->code,
'faultString' => $result->message 'faultString' => $result->message
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment