Ticket #21119: 21119.4.diff

src/wp-includes/user.php

@@ -665 +665 @@
                                 $cap_meta_query['compare'] = 'like';
                         }
 
-                        $qv['meta_query'][] = $cap_meta_query;
+                        if ( empty( $qv['meta_query'] ) || ! in_array( $cap_meta_query, $qv['meta_query'], true ) ) {
+                                $qv['meta_query'][] = $cap_meta_query;
+                        }
                 }
 
                 $meta_query = new WP_Meta_Query();

tests/phpunit/tests/user/query.php

@@ -101 +101 @@
                 $this->assertEquals( $names, $values );
         }
 
+        /**
+         * @ticket 21119
+         */
         function test_prepare_query() {
                 $query = new WP_User_Query();
                 $this->assertEmpty( $query->query_fields );