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

Users: Correct the logic for `switch_to_blog()` in `WP_User_Query::generate_cache_key()`. 

If `$blog_id` equals `0`, it should be treated as the current site ID, and there is no need to switch to a different site.

This commit prevents an unnecessary call to `switch_to_blog()` on single site to avoid a fatal error when using `'orderby' => 'post_count'` and the deprecated `'who' => 'authors'` parameter:
{{{
Uncaught Error: Call to undefined function switch_to_blog() in wp-includes/class-wp-user-query.php:1077
}}}

Follow-up to [55657].

Props dd32, austinginder, RavanH, mukesh27.
Fixes #59011.
Built from https://develop.svn.wordpress.org/trunk@56381


git-svn-id: http://core.svn.wordpress.org/trunk@55893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-08-10 10:26:19 +00:00
parent 12884f0361
commit f106155bf8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/class-wp-user-query.php
View File

@ -1071,12 +1071,15 @@ class WP_User_Query {
if ( isset( $args['blog_id'] ) ) { if ( isset( $args['blog_id'] ) ) {
$blog_id = absint( $args['blog_id'] ); $blog_id = absint( $args['blog_id'] );
} }
if ( ( $args['has_published_posts'] && $blog_id ) || in_array( 'post_count', $ordersby, true ) ) {
$switch = get_current_blog_id() !== $blog_id; if ( $args['has_published_posts'] || in_array( 'post_count', $ordersby, true ) ) {
$switch = $blog_id && get_current_blog_id() !== $blog_id;
if ( $switch ) { if ( $switch ) {
switch_to_blog( $blog_id ); switch_to_blog( $blog_id );
} }
$last_changed .= wp_cache_get_last_changed( 'posts' ); $last_changed .= wp_cache_get_last_changed( 'posts' );
if ( $switch ) { if ( $switch ) {
restore_current_blog(); restore_current_blog();
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.4-alpha-56380'; $wp_version = '6.4-alpha-56381';
/** /**
* 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.