Changeset 1279

Timestamp:

05/14/2004 05:31:54 PM (22 years ago)

Author:

michelvaldrighi

Message:

merging fixes by Mark Ghosh for service pings

Location:

trunk/wp-includes

Files:

• class-xmlrpc.php (modified) (2 diffs)
• functions.php (modified) (1 diff)

trunk/wp-includes/class-xmlrpc.php

@@ -776 +776 @@
 
   function xmlrpcval($val=-1, $type="") {
-        global $xmlrpcTypes;
+        global $xmlrpcTypes;
+        // but this doesn't work, so we redefine it. WEIRD BUG ALERT
+        $xmlrpcI4="i4";
+        $xmlrpcInt="int";
+        $xmlrpcBoolean="boolean";
+        $xmlrpcDouble="double";
+        $xmlrpcString="string";
+        $xmlrpcDateTime="dateTime.iso8601";
+        $xmlrpcBase64="base64";
+        $xmlrpcArray="array";
+        $xmlrpcStruct="struct";
+        $xmlrpcTypes=array($xmlrpcI4 => 1,
+                   $xmlrpcInt => 1,
+                   $xmlrpcBoolean => 1,
+                   $xmlrpcString => 1,
+                   $xmlrpcDouble => 1,
+                   $xmlrpcDateTime => 1,
+                   $xmlrpcBase64 => 1,
+                   $xmlrpcArray => 2,
+                   $xmlrpcStruct => 3);
+        //   print_r($xmlrpcTypes);
         $this->me=array();
         $this->mytype=0;
@@ -1059 +1079 @@
 if (!function_exists('phpxmlrpc_decode')) {
     function phpxmlrpc_decode($xmlrpc_val) {
-       $kind = $xmlrpc_val->kindOf();
+       $kind = @$xmlrpc_val->kindOf();
 
        if($kind == "scalar") {

trunk/wp-includes/functions.php

@@ -503 +503 @@
     $c = new xmlrpc_client($path, $server, 80);
     $r = $c->send($f);
-    
-    if ($debug) {
-        echo "<h3>Response Object Dump:</h3>
-            <pre>\n";
-        print_r($r);
-        echo "</pre>\n";
-    }
-
-    $v = @phpxmlrpc_decode($r->value());
-    if (!$r->faultCode()) {
-        $result['message'] =  "<p class=\"rpcmsg\">";
-        $result['message'] = $result['message'] .  $v["message"] . "<br />\n";
-        $result['message'] = $result['message'] . "</p>";
-    } else {
-        $result['err'] = $r->faultCode();
-        $result['message'] =  "<!--\n";
-        $result['message'] = $result['message'] . "Fault: ";
-        $result['message'] = $result['message'] . "Code: " . $r->faultCode();
-        $result['message'] = $result['message'] . " Reason '" .$r->faultString()."'<BR>";
-        $result['message'] = $result['message'] . "-->\n";
-    }
-
-    if ($debug) print '<blockquote>' . $result['message'] . '</blockquote>';
+
+    if ('0' != $r) {    
+        if ($debug) {
+            echo "<h3>Response Object Dump:</h3>
+                <pre>\n";
+            print_r($r);
+            echo "</pre>\n";
+        }
+
+        $v = @phpxmlrpc_decode($r->value());
+        if (!$r->faultCode()) {
+            $result['message'] =  "<p class=\"rpcmsg\">";
+            $result['message'] = $result['message'] .  $v["message"] . "<br />\n";
+            $result['message'] = $result['message'] . "</p>";
+        } else {
+            $result['err'] = $r->faultCode();
+            $result['message'] =  "<!--\n";
+            $result['message'] = $result['message'] . "Fault: ";
+            $result['message'] = $result['message'] . "Code: " . $r->faultCode();
+            $result['message'] = $result['message'] . " Reason '" .$r->faultString()."'<BR>";
+            $result['message'] = $result['message'] . "-->\n";
+        }
+
+        if ($debug) print '<blockquote>' . $result['message'] . '</blockquote>';
+    }
 }