Changeset 12852 for trunk/xmlrpc.php

Timestamp:

01/26/2010 08:15:43 PM (15 years ago)

Author:

ryan

Message:

Integrate wpmu_blogger_getUsersBlogs() directly into xmlrpc.php. see #11644

File:

• trunk/xmlrpc.php (modified) (4 diffs)

trunk/xmlrpc.php

@@ -453 +453 @@
         $password = $args[1];
 
-        if ( !$user = $this->login($username, $password) ) {
-            return $this->error;
-        }
+        if ( !$user = $this->login($username, $password) )
+            return $this->error;
+
 
         do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
@@ -1547 +1547 @@
      */
     function blogger_getUsersBlogs($args) {
+        if ( is_multisite() )
+            return _multisite_getUsersBlogs($args);
 
         $this->escape($args);
@@ -1569 +1571 @@
 
         return array($struct);
+    }
+
+    /**
+     * Private function for retrieving a users blogs for multisite setups
+     *
+     * @access protected
+     */
+    function _multisite_getUsersBlogs($args) {
+        global $current_blog;
+        $domain = $current_blog->domain;
+        $path = $current_blog->path . 'xmlrpc.php';
+        $protocol = is_ssl() ? 'https' : 'http';
+
+        $rpc = new IXR_Client("$protocol://{$domain}{$path}");
+        $rpc->query('wp.getUsersBlogs', $args[1], $args[2]);
+        $blogs = $rpc->getResponse();
+
+        if ( isset($blogs['faultCode']) )
+            return new IXR_Error($blogs['faultCode'], $blogs['faultString']);
+
+        if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {
+            return $blogs;
+        } else {
+            foreach ( (array) $blogs as $blog ) {
+                if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) )
+                    return array($blog);
+            }
+            return array();
+        }
     }
 
@@ -2107 +2138 @@
         if ( $post_more )
             $post_content = $post_content . "<!--more-->" . $post_more;
- 
+
         $to_ping = $content_struct['mt_tb_ping_urls'];
         if ( is_array($to_ping) )