Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

In WP_User_Query, $meta_query should be a class property rather than a local variable.

Browse Source 
This provides better parity with other query classes, and makes it possible to
write more direct unit tests.

See #31265.
Built from https://develop.svn.wordpress.org/trunk@31665


git-svn-id: http://core.svn.wordpress.org/trunk@31646 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2015-03-07 16:35:27 +00:00
parent 503b36dd23
commit f07ebeff91
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wp-includes/user.php
View File

@ -473,6 +473,15 @@ class WP_User_Query {
*/ */
private $total_users = 0; private $total_users = 0;
/**
* Metadata query container.
*
* @since 4.2.0
* @access public
* @var object WP_Meta_Query
*/
public $meta_query = false;
private $compat_fields = array( 'results', 'total_users' ); private $compat_fields = array( 'results', 'total_users' );
// SQL clauses // SQL clauses
@ -730,8 +739,8 @@ 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(); $this->meta_query = new WP_Meta_Query();
$meta_query->parse_query_vars( $qv ); $this->meta_query->parse_query_vars( $qv );
$role = ''; $role = '';
if ( isset( $qv['role'] ) ) if ( isset( $qv['role'] ) )
@ -746,25 +755,25 @@ class WP_User_Query {
$cap_meta_query['compare'] = 'like'; $cap_meta_query['compare'] = 'like';
} }
if ( empty( $meta_query->queries ) ) { if ( empty( $this->meta_query->queries ) ) {
$meta_query->queries = array( $cap_meta_query ); $this->meta_query->queries = array( $cap_meta_query );
} elseif ( ! in_array( $cap_meta_query, $meta_query->queries, true ) ) { } elseif ( ! in_array( $cap_meta_query, $this->meta_query->queries, true ) ) {
// Append the cap query to the original queries and reparse the query. // Append the cap query to the original queries and reparse the query.
$meta_query->queries = array( $this->meta_query->queries = array(
'relation' => 'AND', 'relation' => 'AND',
array( $meta_query->queries, $cap_meta_query ), array( $this->meta_query->queries, $cap_meta_query ),
); );
} }
$meta_query->parse_query_vars( $meta_query->queries ); $this->meta_query->parse_query_vars( $this->meta_query->queries );
} }
if ( !empty( $meta_query->queries ) ) { if ( !empty( $this->meta_query->queries ) ) {
$clauses = $meta_query->get_sql( 'user', $wpdb->users, 'ID', $this ); $clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
$this->query_from .= $clauses['join']; $this->query_from .= $clauses['join'];
$this->query_where .= $clauses['where']; $this->query_where .= $clauses['where'];
if ( 'OR' == $meta_query->relation ) if ( 'OR' == $this->meta_query->relation )
$this->query_fields = 'DISTINCT ' . $this->query_fields; $this->query_fields = 'DISTINCT ' . $this->query_fields;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31664'; $wp_version = '4.2-alpha-31665';
/** /**
* 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.