Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/wp-includes/class-wp-xmlrpc-server.php
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@ public function wp_getUsersBlogs( $args ) {
'blogid' => (string) $blog_id,
'blogName' => get_option( 'blogname' ),
'xmlrpc' => site_url( 'xmlrpc.php', 'rpc' ),
'siteIcon' => get_site_icon_url( 512 ),
);

restore_current_blog();
Expand Down Expand Up @@ -4867,6 +4868,7 @@ public function blogger_getUsersBlogs( $args ) {
'blogid' => '1',
'blogName' => get_option( 'blogname' ),
'xmlrpc' => site_url( 'xmlrpc.php', 'rpc' ),
'siteIcon' => get_site_icon_url( 512 ),
);

return array( $struct );
Expand Down
60 changes: 60 additions & 0 deletions tests/phpunit/tests/xmlrpc/wp/getUsersBlogs.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?php

/**
* @group xmlrpc
* @group user
*/
class Tests_XMLRPC_wp_getUsersBlogs extends WP_XMLRPC_UnitTestCase {

public function test_empty_site_icon() {
$subscriber_id = $this->make_user_by_role( 'subscriber' );

// wp_getUsersBlogs
$result = $this->myxmlrpcserver->wp_getUsersBlogs( array( 'subscriber', 'subscriber' ) );
$this->assertNotIXRError( $result );
$this->assertIsArray( $result );
$this->assertArrayHasKey( 0, $result );
$this->assertArrayHasKey( 'siteIcon', $result[0] );
$this->assertSame( '', $result[0]['siteIcon'] );

// blogger_getUsersBlogs
$result_blogger = $this->myxmlrpcserver->blogger_getUsersBlogs( array( '', 'subscriber', 'subscriber' ) );
$this->assertNotIXRError( $result_blogger );
$this->assertIsArray( $result_blogger );
$this->assertArrayHasKey( 0, $result_blogger );
$this->assertArrayHasKey( 'siteIcon', $result_blogger[0] );
$this->assertSame( '', $result_blogger[0]['siteIcon'] );
}

public function test_with_site_icon() {
$subscriber_id = $this->make_user_by_role( 'subscriber' );

// Create an attachment and set it as site_icon
$attachment_id = self::factory()->attachment->create_object(
array(
'file' => DIR_TESTDATA . '/images/test-image.jpg',
'post_mime_type' => 'image/jpeg',
'post_type' => 'attachment',
)
);
update_option( 'site_icon', $attachment_id );

$expected_url = get_site_icon_url( 512 );

// wp_getUsersBlogs
$result = $this->myxmlrpcserver->wp_getUsersBlogs( array( 'subscriber', 'subscriber' ) );
$this->assertNotIXRError( $result );
$this->assertIsArray( $result );
$this->assertArrayHasKey( 0, $result );
$this->assertArrayHasKey( 'siteIcon', $result[0] );
$this->assertSame( $expected_url, $result[0]['siteIcon'] );

// blogger_getUsersBlogs
$result_blogger = $this->myxmlrpcserver->blogger_getUsersBlogs( array( '', 'subscriber', 'subscriber' ) );
$this->assertNotIXRError( $result_blogger );
$this->assertIsArray( $result_blogger );
$this->assertArrayHasKey( 0, $result_blogger );
$this->assertArrayHasKey( 'siteIcon', $result_blogger[0] );
$this->assertSame( $expected_url, $result_blogger[0]['siteIcon'] );
}
}
Loading