Changeset 12852

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-includes/ms-default-filters.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)
• xmlrpc.php (modified) (4 diffs)

trunk/wp-includes/ms-default-filters.php

@@ -3 +3 @@
 add_filter ( 'wpmu_validate_user_signup', 'signup_nonce_check' );
 add_action ( 'init', 'maybe_add_existing_user_to_blog' );
-add_filter ( 'xmlrpc_methods', 'attach_wpmu_xmlrpc' );
 add_filter ( 'wp_authenticate_user', 'wordpressmu_authenticate_siteadmin', 10, 2 );
 add_action ( 'wpmu_new_user', 'newuser_notify_siteadmin' );

trunk/wp-includes/ms-functions.php

@@ -1790 +1790 @@
 }
 
-/*
-XMLRPC getUsersBlogs() for a multiblog environment
-http://trac.mu.wordpress.org/attachment/ticket/551/xmlrpc-mu.php
-*/
-function wpmu_blogger_getUsersBlogs( $args ) {
-    global $current_blog;
-    $domain = $current_blog->domain;
-    $path = $current_blog->path . 'xmlrpc.php';
-
-    $rpc = new IXR_Client("http://{$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();
-    }
-}
-
-function attach_wpmu_xmlrpc( $methods ) {
-    $methods['blogger.getUsersBlogs'] = 'wpmu_blogger_getUsersBlogs';
-    return $methods;
-}
-
 function mu_locale( $locale ) {
     if ( defined('WP_INSTALLING') == false ) {

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) )