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

Users: Prime user meta in `WP_User_Query` class. 

When querying 'fields' equal to 'all' using the `WP_User_Query` class, this returns an array of `WP_User` objects. A `WP_User` object requires user meta to be primed, as the user's role is stored in user meta. Ensure that all users meta is primed in a single request by calling the `cache_users` function when querying 'fields' equal to 'all'. Soft deprecate fields equal to `all_with_meta` as it now acts the same as 'fields' equal to 'all'.

Props Spacedmonkey, peterwilsoncc, mehulkaklotar, timothyblynjacobs, furi3r.
Fixes #55594.
Built from https://develop.svn.wordpress.org/trunk@53655


git-svn-id: http://core.svn.wordpress.org/trunk@53214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
spacedmonkey 2022-07-05 09:28:13 +00:00
parent 0f3b3218c2
commit 6e619966a6
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,8 +235,8 @@ class WP_User_Query {
* - 'user_status' * - 'user_status'
* - 'spam' (only available on multisite installs) * - 'spam' (only available on multisite installs)
* - 'deleted' (only available on multisite installs) * - 'deleted' (only available on multisite installs)
* - 'all' for all fields * - 'all' for all fields and loads user meta.
* - 'all_with_meta' to include meta fields. * - 'all_with_meta' Deprecated. Use 'all'.
* Default 'all'. * Default 'all'.
* @type string $who Type of users to query. Accepts 'authors'. * @type string $who Type of users to query. Accepts 'authors'.
* Default empty (all users). * Default empty (all users).
@ -310,9 +310,7 @@ class WP_User_Query {
$this->query_fields[] = "$wpdb->users.$field"; $this->query_fields[] = "$wpdb->users.$field";
} }
$this->query_fields = implode( ',', $this->query_fields ); $this->query_fields = implode( ',', $this->query_fields );
} elseif ( 'all' === $qv['fields'] ) { } elseif ( 'all_with_meta' === $qv['fields'] || 'all' === $qv['fields'] || ! in_array( $qv['fields'], $allowed_fields, true ) ) {
$this->query_fields = "$wpdb->users.*";
} elseif ( ! in_array( $qv['fields'], $allowed_fields, true ) ) {
$this->query_fields = "$wpdb->users.ID"; $this->query_fields = "$wpdb->users.ID";
} else { } else {
$field = 'id' === strtolower( $qv['fields'] ) ? 'ID' : sanitize_key( $qv['fields'] ); $field = 'id' === strtolower( $qv['fields'] ) ? 'ID' : sanitize_key( $qv['fields'] );
@ -808,7 +806,7 @@ class WP_User_Query {
{$this->query_limit} {$this->query_limit}
"; ";
if ( is_array( $qv['fields'] ) || 'all' === $qv['fields'] ) { if ( is_array( $qv['fields'] ) ) {
$this->results = $wpdb->get_results( $this->request ); $this->results = $wpdb->get_results( $this->request );
} else { } else {
$this->results = $wpdb->get_col( $this->request ); $this->results = $wpdb->get_col( $this->request );
@ -842,19 +840,19 @@ class WP_User_Query {
foreach ( $this->results as $result ) { foreach ( $this->results as $result ) {
$result->id = $result->ID; $result->id = $result->ID;
} }
} elseif ( 'all_with_meta' === $qv['fields'] ) { } elseif ( 'all_with_meta' === $qv['fields'] || 'all' === $qv['fields'] ) {
cache_users( $this->results ); cache_users( $this->results );
$r = array(); $r = array();
foreach ( $this->results as $userid ) { foreach ( $this->results as $userid ) {
if ( 'all_with_meta' === $qv['fields'] ) {
$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] ); $r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
} else {
$r[] = new WP_User( $userid, '', $qv['blog_id'] );
}
} }
$this->results = $r; $this->results = $r;
} elseif ( 'all' === $qv['fields'] ) {
foreach ( $this->results as $key => $user ) {
$this->results[ $key ] = new WP_User( $user, '', $qv['blog_id'] );
}
} }
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-alpha-53654'; $wp_version = '6.1-alpha-53655';
/** /**
* 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.