Changeset 34574 for trunk/src/wp-includes/class-wp-xmlrpc-server.php

Timestamp:

09/26/2015 04:34:50 AM (9 years ago)

Author:

wonderboymusic

Message:

XML-RPC: In wp_xmlrpc_server::wp_getUsersBlogs(), return the isPrimary flag for each blog.

Props SergeyBiryukov, daniloercoli.
Fixes #25958.

File:

• trunk/src/wp-includes/class-wp-xmlrpc-server.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -544 +544 @@
      * @return array|IXR_Error Array contains:
      *  - 'isAdmin'
+     *  - 'isPrimary' - whether the blog is the user's primary blog
      *  - 'url'
      *  - 'blogid'
@@ -579 +580 @@
         $blogs = (array) get_blogs_of_user( $user->ID );
         $struct = array();
+        $primary_blog_id = 0;
+        $active_blog = get_active_blog_for_user( $user->ID );
+        if ( $active_blog ) {
+            $primary_blog_id = (int) $active_blog->blog_id;
+        }
 
         foreach ( $blogs as $blog ) {
@@ -590 +596 @@
 
             $is_admin = current_user_can( 'manage_options' );
+            $is_primary = ( (int) $blog_id === $primary_blog_id );
 
             $struct[] = array(
-                'isAdmin'       => $is_admin,
-                'url'           => home_url( '/' ),
-                'blogid'        => (string) $blog_id,
-                'blogName'      => get_option( 'blogname' ),
-                'xmlrpc'        => site_url( 'xmlrpc.php', 'rpc' ),
+                'isAdmin'   => $is_admin,
+                'isPrimary' => $is_primary,
+                'url'       => home_url( '/' ),
+                'blogid'    => (string) $blog_id,
+                'blogName'  => get_option( 'blogname' ),
+                'xmlrpc'    => site_url( 'xmlrpc.php', 'rpc' ),
             );