Changeset 32207

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.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/user/query.php (modified) (1 diff)

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
         }
 

trunk/tests/phpunit/tests/user/query.php

@@ -626 +626 @@
         $this->assertSame( array( 'author' => true ), $user->caps );
     }
+
+    /**
+     * @ticket 32019
+     */
+    public function test_who_authors() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $b = $this->factory->blog->create();
+        $users = $this->factory->user->create_many( 3 );
+
+        add_user_to_blog( $b, $users[0], 'subscriber' );
+        add_user_to_blog( $b, $users[1], 'author' );
+        add_user_to_blog( $b, $users[2], 'editor' );
+
+        $q = new WP_User_Query( array(
+            'who' => 'authors',
+            'blog_id' => $b,
+        ) );
+
+        $found = wp_list_pluck( $q->get_results(), 'ID' );
+
+        $this->assertNotContains( $users[0], $found );
+        $this->assertContains( $users[1], $found );
+        $this->assertContains( $users[2], $found );
+    }
+
+    /**
+     * @ticket 32019
+     */
+    public function test_who_authors_should_work_alongside_meta_query() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+        }
+
+        $b = $this->factory->blog->create();
+        $users = $this->factory->user->create_many( 3 );
+
+        add_user_to_blog( $b, $users[0], 'subscriber' );
+        add_user_to_blog( $b, $users[1], 'author' );
+        add_user_to_blog( $b, $users[2], 'editor' );
+
+        add_user_meta( $users[1], 'foo', 'bar' );
+        add_user_meta( $users[2], 'foo', 'baz' );
+
+        $q = new WP_User_Query( array(
+            'who' => 'authors',
+            'blog_id' => $b,
+            'meta_query' => array(
+                'key' => 'foo',
+                'value' => 'bar',
+            ),
+        ) );
+
+        $found = wp_list_pluck( $q->get_results(), 'ID' );
+
+        $this->assertNotContains( $users[0], $found );
+        $this->assertContains( $users[1], $found );
+        $this->assertNotContains( $users[2], $found );
+    }
 }