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

XML-RPC: Avoid loopback request in `blogger.getUsersBlogs`. 

The `blogger.getUsersBlogs` endpoint does not currently work on Multisite environments which require HTTPS.

This changes `wp_xmlrpc_server::_multisite_getUsersBlogs()` to call the method directly instead of relying on a new `IXR_Client` request, which only supports HTTP.

Props dd32.
Fixes #56492.
Built from https://develop.svn.wordpress.org/trunk@54468


git-svn-id: http://core.svn.wordpress.org/trunk@54027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2022-10-11 01:46:14 +00:00
parent 52b8697b05
commit 8608cdcee8
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4859,12 +4859,9 @@ class wp_xmlrpc_server extends IXR_Server {
$domain = $current_blog->domain;
$path = $current_blog->path . 'xmlrpc.php';
$rpc = new IXR_Client( set_url_scheme( "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'] );
$blogs = $this->wp_getUsersBlogs( $args );
if ( $blogs instanceof IXR_Error ) {
return $blogs;
}
if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1-beta3-54467';
$wp_version = '6.1-beta3-54468';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.