IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a nested meta query when querying by role in WP_User_Query.

Browse Source 
If a user query includes a meta query together with a role argument,
nest the original meta query and append the role meta query with an
AND relationship.

fixes #23849, #27026.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Kovshenin 2014-10-29 21:41:22 +00:00
parent beaa3f6928
commit 73f6a574b7
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/user.php
View File

@ -715,6 +715,9 @@ class WP_User_Query {
$qv['blog_id'] = $blog_id = 0; // Prevent extra meta query $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
} }
$meta_query = new WP_Meta_Query();
$meta_query->parse_query_vars( $qv );
$role = ''; $role = '';
if ( isset( $qv['role'] ) ) if ( isset( $qv['role'] ) )
$role = trim( $qv['role'] ); $role = trim( $qv['role'] );
@ -728,13 +731,18 @@ class WP_User_Query {
$cap_meta_query['compare'] = 'like'; $cap_meta_query['compare'] = 'like';
} }
if ( empty( $qv['meta_query'] ) || ! in_array( $cap_meta_query, $qv['meta_query'], true ) ) { if ( empty( $meta_query->queries ) ) {
$qv['meta_query'][] = $cap_meta_query; $meta_query->queries = array( $cap_meta_query );
} elseif ( ! in_array( $cap_meta_query, $meta_query->queries, true ) ) {
// Append the cap query to the original queries and reparse the query.
$meta_query->queries = array(
'relation' => 'AND',
array( $meta_query->queries, $cap_meta_query ),
);
} }
}
$meta_query = new WP_Meta_Query(); $meta_query->parse_query_vars( $meta_query->queries );
$meta_query->parse_query_vars( $qv ); }
if ( !empty( $meta_query->queries ) ) { if ( !empty( $meta_query->queries ) ) {
$clauses = $meta_query->get_sql( 'user', $wpdb->users, 'ID', $this ); $clauses = $meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30093'; $wp_version = '4.1-alpha-30094';
/** /**
* 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.