Changeset 37360 for trunk/src/wp-includes/class-wp-user-query.php

Timestamp:

05/04/2016 06:56:58 PM (10 years ago)

Author:

boonebgorges

Message:

Users: The 'who' parameter should not interfere with 'meta_key' + 'meta_value' in WP_User_Query.

Props adrianosilvaferreira.
Fixes #36724.

File:

• trunk/src/wp-includes/class-wp-user-query.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-user-query.php

@@ -256 +256 @@
                 }
 
-                if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
-                        $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
-                        $qv['meta_value'] = 0;
-                        $qv['meta_compare'] = '!=';
-                        $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
-                }
-
                 if ( $qv['has_published_posts'] && $blog_id ) {
                         if ( true === $qv['has_published_posts'] ) {
@@ -281 +274 @@
                 $this->meta_query = new WP_Meta_Query();
                 $this->meta_query->parse_query_vars( $qv );
+
+                if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
+                        $who_query = array(
+                                'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
+                                'value' => 0,
+                                'compare' => '!=',
+                        );
+
+                        // Prevent extra meta query.
+                        $qv['blog_id'] = $blog_id = 0;
+
+                        if ( empty( $this->meta_query->queries ) ) {
+                                $this->meta_query->queries = array( $who_query );
+                        } else {
+                                // Append the cap query to the original queries and reparse the query.
+                                $this->meta_query->queries = array(
+                                        'relation' => 'AND',
+                                        array( $this->meta_query->queries, $who_query ),
+                                );
+                        }
+
+                        $this->meta_query->parse_query_vars( $this->meta_query->queries );
+                }
 
                 $roles = array();