Changeset 32207 for trunk/src/wp-includes/user.php

Timestamp:

04/20/2015 03:15:14 PM (10 years ago)

Author:

boonebgorges

Message:

Ensure that 'who' param is respected when generating meta_query in WP_User_Query.

Since [31669], the 'who' param had been parsed after meta_query was generated,
so that 'who' was effectively ignored.

Props imath.
Fixes #32019.

File:

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

trunk/src/wp-includes/user.php

@@ -627 +627 @@
         }
 
+        $blog_id = 0;
+        if ( isset( $qv['blog_id'] ) ) {
+            $blog_id = absint( $qv['blog_id'] );
+        }
+
+        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
+        }
+
         // Meta query.
         $this->meta_query = new WP_Meta_Query();
         $this->meta_query->parse_query_vars( $qv );
-
-        $blog_id = 0;
-        if ( isset( $qv['blog_id'] ) ) {
-            $blog_id = absint( $qv['blog_id'] );
-        }
 
         $role = '';
@@ -774 +781 @@
 
             $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
-        }
-
-        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
         }