summaryrefslogtreecommitdiff
path: root/includes/xmlrpcs.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-04-28 10:04:05 +0000
committerDries Buytaert <dries@buytaert.net>2008-04-28 10:04:05 +0000
commita2d8a12903a4327dd650aebf452a90ff3c992090 (patch)
tree0481a9e7038e88f16380ccf60bfbd4288815ac88 /includes/xmlrpcs.inc
parentbc8a2b23da92545b9e13299126dac8c381ddbbf6 (diff)
downloadbrdo-a2d8a12903a4327dd650aebf452a90ff3c992090.tar.gz
brdo-a2d8a12903a4327dd650aebf452a90ff3c992090.tar.bz2
- Patch #231132 by snufkin: fixed invalid XML-RPC error messages due to HTML tags being inserted in the message string.
Diffstat (limited to 'includes/xmlrpcs.inc')
-rw-r--r--includes/xmlrpcs.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index 33e5bb209..21509d494 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -149,7 +149,7 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) {
}
// Has this method been mapped to a Drupal function by us or by modules?
if (!isset($xmlrpc_server->callbacks[$methodname])) {
- return xmlrpc_error(-32601, t('Server error. Requested method %methodname not specified.', array("%methodname" => $xmlrpc_server->message->methodname)));
+ return xmlrpc_error(-32601, t('Server error. Requested method @methodname not specified.', array("@methodname" => $xmlrpc_server->message->methodname)));
}
$method = $xmlrpc_server->callbacks[$methodname];
$signature = $xmlrpc_server->signatures[$methodname];
@@ -203,7 +203,7 @@ function xmlrpc_server_call($xmlrpc_server, $methodname, $args) {
}
if (!function_exists($method)) {
- return xmlrpc_error(-32601, t('Server error. Requested function %method does not exist.', array("%method" => $method)));
+ return xmlrpc_error(-32601, t('Server error. Requested function @method does not exist.', array("@method" => $method)));
}
// Call the mapped function
return call_user_func_array($method, $args);
@@ -288,10 +288,10 @@ function xmlrpc_server_get_capabilities() {
function xmlrpc_server_method_signature($methodname) {
$xmlrpc_server = xmlrpc_server_get();
if (!isset($xmlrpc_server->callbacks[$methodname])) {
- return xmlrpc_error(-32601, t('Server error. Requested method %methodname not specified.', array("%methodname" => $methodname)));
+ return xmlrpc_error(-32601, t('Server error. Requested method @methodname not specified.', array("@methodname" => $methodname)));
}
if (!is_array($xmlrpc_server->signatures[$methodname])) {
- return xmlrpc_error(-32601, t('Server error. Requested method %methodname signature not specified.', array("%methodname" => $methodname)));
+ return xmlrpc_error(-32601, t('Server error. Requested method @methodname signature not specified.', array("@methodname" => $methodname)));
}
// We array of types
$return = array();