Changeset 31665

Timestamp:

03/07/2015 04:34:42 PM (11 years ago)

Author:

boonebgorges

Message:

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

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

See #31265.

File:

• trunk/src/wp-includes/user.php (modified) (3 diffs)

trunk/src/wp-includes/user.php

@@ -473 +473 @@
      */
     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' );
@@ -731 +740 @@
         }
 
-        $meta_query = new WP_Meta_Query();
-        $meta_query->parse_query_vars( $qv );
+        $this->meta_query = new WP_Meta_Query();
+        $this->meta_query->parse_query_vars( $qv );
 
         $role = '';
@@ -747 +756 @@
             }
 
-            if ( empty( $meta_query->queries ) ) {
-                $meta_query->queries = array( $cap_meta_query );
-            } elseif ( ! in_array( $cap_meta_query, $meta_query->queries, true ) ) {
+            if ( empty( $this->meta_query->queries ) ) {
+                $this->meta_query->queries = array( $cap_meta_query );
+            } elseif ( ! in_array( $cap_meta_query, $this->meta_query->queries, true ) ) {
                 // Append the cap query to the original queries and reparse the query.
-                $meta_query->queries = array(
+                $this->meta_query->queries = array(
                     '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 );
-        }
-
-        if ( !empty( $meta_query->queries ) ) {
-            $clauses = $meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
+            $this->meta_query->parse_query_vars( $this->meta_query->queries );
+        }
+
+        if ( !empty( $this->meta_query->queries ) ) {
+            $clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
             $this->query_from .= $clauses['join'];
             $this->query_where .= $clauses['where'];
 
-            if ( 'OR' == $meta_query->relation )
+            if ( 'OR' == $this->meta_query->relation )
                 $this->query_fields = 'DISTINCT ' . $this->query_fields;
         }