WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Props SergeyBiryukov, daniloercoli.
Fixes #25958.

Built from https://develop.svn.wordpress.org/trunk@34574


git-svn-id: http://core.svn.wordpress.org/trunk@34538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-26 04:35:25 +00:00
parent 9b253bbc7b
commit c8b308a647
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/class-wp-xmlrpc-server.php
View File

@ -543,6 +543,7 @@ class wp_xmlrpc_server extends IXR_Server {
* } * }
* @return array|IXR_Error Array contains: * @return array|IXR_Error Array contains:
* - 'isAdmin' * - 'isAdmin'
* - 'isPrimary' - whether the blog is the user's primary blog
* - 'url' * - 'url'
* - 'blogid' * - 'blogid'
* - 'blogName' * - 'blogName'
@ -578,6 +579,11 @@ class wp_xmlrpc_server extends IXR_Server {
$blogs = (array) get_blogs_of_user( $user->ID ); $blogs = (array) get_blogs_of_user( $user->ID );
$struct = array(); $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 ) { foreach ( $blogs as $blog ) {
// Don't include blogs that aren't hosted at this site. // Don't include blogs that aren't hosted at this site.
@ -589,13 +595,15 @@ class wp_xmlrpc_server extends IXR_Server {
switch_to_blog( $blog_id ); switch_to_blog( $blog_id );
$is_admin = current_user_can( 'manage_options' ); $is_admin = current_user_can( 'manage_options' );
$is_primary = ( (int) $blog_id === $primary_blog_id );
$struct[] = array( $struct[] = array(
'isAdmin' => $is_admin, 'isAdmin' => $is_admin,
'url' => home_url( '/' ), 'isPrimary' => $is_primary,
'blogid' => (string) $blog_id, 'url' => home_url( '/' ),
'blogName' => get_option( 'blogname' ), 'blogid' => (string) $blog_id,
'xmlrpc' => site_url( 'xmlrpc.php', 'rpc' ), 'blogName' => get_option( 'blogname' ),
'xmlrpc' => site_url( 'xmlrpc.php', 'rpc' ),
); );
restore_current_blog(); restore_current_blog();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34573'; $wp_version = '4.4-alpha-34574';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.