Changeset 30094

Timestamp:

10/29/2014 09:40:04 PM (10 years ago)

Author:

kovshenin

Message:

Use a nested meta query when querying by role in WP_User_Query.

If a user query includes a meta query together with a role argument,
nest the original meta query and append the role meta query with an
AND relationship.

fixes #23849, #27026.

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

@@ -716 +716 @@
         }
 
+        $meta_query = new WP_Meta_Query();
+        $meta_query->parse_query_vars( $qv );
+
         $role = '';
         if ( isset( $qv['role'] ) )
@@ -729 +732 @@
             }
 
-            if ( empty( $qv['meta_query'] ) || ! in_array( $cap_meta_query, $qv['meta_query'], true ) ) {
-                $qv['meta_query'][] = $cap_meta_query;
+            if ( empty( $meta_query->queries ) ) {
+                $meta_query->queries = array( $cap_meta_query );
+            } elseif ( ! in_array( $cap_meta_query, $meta_query->queries, true ) ) {
+                // Append the cap query to the original queries and reparse the query.
+                $meta_query->queries = array(
+                    'relation' => 'AND',
+                    array( $meta_query->queries, $cap_meta_query ),
+                );
             }
-        }
-
-        $meta_query = new WP_Meta_Query();
-        $meta_query->parse_query_vars( $qv );
+
+            $meta_query->parse_query_vars( $meta_query->queries );
+        }
 
         if ( !empty( $meta_query->queries ) ) {

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

@@ -222 +222 @@
         $this->assertEquals( $_query_vars, $query->query_vars );
     }
+
+    /**
+     * @ticket 23849
+     */
+    function test_meta_query_with_role() {
+        $author_ids = $this->factory->user->create_many( 4, array( 'role' => 'author' ) );
+
+        add_user_meta( $author_ids[0], 'foo', 'bar' );
+        add_user_meta( $author_ids[1], 'foo', 'baz' );
+
+        // Users with foo = bar or baz restricted to the author role.
+        $query = new WP_User_Query( array(
+            'fields' => '',
+            'role' => 'author',
+            'meta_query' => array(
+                'relation' => 'OR',
+                array(
+                    'key' => 'foo',
+                    'value' => 'bar',
+                ),
+                array(
+                    'key' => 'foo',
+                    'value' => 'baz',
+                ),
+            ),
+        ) );
+
+        $this->assertEquals( array( $author_ids[0], $author_ids[1] ), $query->get_results() );
+    }
 }