From e077b55f7e5b1abfba810c972a225b8f2efc0321 Mon Sep 17 00:00:00 2001 From: michelvaldrighi Date: Tue, 30 Mar 2004 21:25:21 +0000 Subject: [PATCH] =?UTF-8?q?changing=20xmlrpc=5Fencode=20to=20phpxmlrpc?= =?UTF-8?q?=EF=BF=BD=5Fencode,=20xmlrpc=5Fdecode=20to=20phpxmlrpc=5Fdecode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.automattic.com/wordpress/trunk@1034 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-xmlrpc.php | 14 +++++++------- wp-includes/functions.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-includes/class-xmlrpc.php b/wp-includes/class-xmlrpc.php index 7e9b4ae2a6..c923960505 100644 --- a/wp-includes/class-xmlrpc.php +++ b/wp-includes/class-xmlrpc.php @@ -1055,8 +1055,8 @@ function iso8601_decode($idate, $utc=0) { * * * author: Dan Libby (dan@libby.com) * ****************************************************************/ -if (!function_exists('xmlrpc_decode')) { - function xmlrpc_decode($xmlrpc_val) { +if (!function_exists('phpxmlrpc_decode')) { + function phpxmlrpc_decode($xmlrpc_val) { $kind = $xmlrpc_val->kindOf(); if($kind == "scalar") { @@ -1067,7 +1067,7 @@ if (!function_exists('xmlrpc_decode')) { $arr = array(); for($i = 0; $i < $size; $i++) { - $arr[]=xmlrpc_decode($xmlrpc_val->arraymem($i)); + $arr[]=phpxmlrpc_decode($xmlrpc_val->arraymem($i)); } return $arr; } @@ -1076,7 +1076,7 @@ if (!function_exists('xmlrpc_decode')) { $arr = array(); while(list($key,$value)=$xmlrpc_val->structeach()) { - $arr[$key] = xmlrpc_decode($value); + $arr[$key] = phpxmlrpc_decode($value); } return $arr; } @@ -1095,8 +1095,8 @@ if (!function_exists('xmlrpc_decode')) { * * * author: Dan Libby (dan@libby.com) * ****************************************************************/ -if (!function_exists('xmlrpc_encode')) { - function xmlrpc_encode($php_val) { +if (!function_exists('phpxmlrpc_encode')) { + function phpxmlrpc_encode($php_val) { global $xmlrpcInt; global $xmlrpcDouble; global $xmlrpcString; @@ -1112,7 +1112,7 @@ if (!function_exists('xmlrpc_encode')) { case "object": $arr = array(); while (list($k,$v) = each($php_val)) { - $arr[$k] = xmlrpc_encode($v); + $arr[$k] = phpxmlrpc_encode($v); } $xmlrpc_val->addStruct($arr); break; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index d81466f841..0e274ea7af 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -579,7 +579,7 @@ function weblog_ping($server = '', $path = '') { print "\n"; } - $v=@xmlrpc_decode($r->value()); + $v = @phpxmlrpc_decode($r->value()); if (!$r->faultCode()) { $result['message'] = "

"; $result['message'] = $result['message'] . $v["message"] . "
\n";