Ticket #22212: 22212.3.patch

src/wp-includes/user.php

@@ -504 +504 @@
                 if ( empty( $this->query_vars ) || ! empty( $query ) ) {
                         $this->query_limit = null;
                         $this->query_vars = wp_parse_args( $query, array(
-                                'blog_id' => $GLOBALS['blog_id'],
-                                'role' => '',
-                                'meta_key' => '',
-                                'meta_value' => '',
-                                'meta_compare' => '',
-                                'include' => array(),
-                                'exclude' => array(),
-                                'search' => '',
+                                'blog_id'        => $GLOBALS['blog_id'],
+                                'role'           => array(),
+                                'meta_key'       => '',
+                                'meta_value'     => '',
+                                'meta_compare'   => '',
+                                'include'        => array(),
+                                'exclude'        => array(),
+                                'search'         => '',
                                 'search_columns' => array(),
-                                'orderby' => 'login',
-                                'order' => 'ASC',
-                                'offset' => '',
-                                'number' => '',
-                                'count_total' => true,
-                                'fields' => 'all',
-                                'who' => ''
+                                'orderby'        => 'login',
+                                'order'          => 'ASC',
+                                'offset'         => '',
+                                'number'         => '',
+                                'count_total'    => true,
+                                'fields'         => 'all',
+                                'who'            => ''
                         ) );
                 }
 
@@ -652 +652 @@
                         $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
                 }
 
-                $role = '';
-                if ( isset( $qv['role'] ) )
-                        $role = trim( $qv['role'] );
+                $roles = array();
 
-                if ( $blog_id && ( $role || is_multisite() ) ) {
-                        $cap_meta_query = array();
-                        $cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-
-                        if ( $role ) {
-                                $cap_meta_query['value'] = '"' . $role . '"';
-                                $cap_meta_query['compare'] = 'like';
+                if ( isset( $qv['role'] ) ) {
+                        if ( is_array( $qv['role'] ) ) {
+                                $roles = $qv['role'];
+                        } elseif ( is_string( $qv['role'] ) && ! empty( $qv['role'] ) ) {
+                                $roles = array( $qv['role'] );
                         }
+                }
 
+                if ( $blog_id && ( ! empty( $roles ) || is_multisite() ) ) {
+
+                        if ( ! empty( $roles ) ) {
+                                $from        = '';
+                                $where       = ' AND ( ';
+                                $roles_count = count( $roles );
+
+                                for ( $i = 0; $i < $roles_count; $i ++ ) {
+
+                                        $alias = 'role_meta' . $i;
+                                        $from .= " INNER JOIN {$wpdb->usermeta} AS {$alias} ON ({$wpdb->users}.ID = {$alias}.user_id)";
+
+                                        if ( $i > 0 ) {
+                                                $where .= ' OR';
+                                        }
+
+                                        $where .= " ( ({$alias}.meta_key = '" . $wpdb->get_blog_prefix( $blog_id ) . "capabilities' AND CAST({$alias}.meta_value AS CHAR) LIKE  '%\"{$roles[$i]}\"%'  ) )";
+
+                                }
+                                $where .= ' )';
+
+                                $this->query_from .= $from;
+                                $this->query_where .= $where;
+                                $this->query_fields = 'DISTINCT ' . $wpdb->users . '.*';
+
+                        }
+
                         if ( empty( $qv['meta_query'] ) || ! in_array( $cap_meta_query, $qv['meta_query'], true ) ) {
                                 $qv['meta_query'][] = $cap_meta_query;
                         }
                 }
 
+                // Add Multisite/Network check
+                if ( is_multisite() ) {
+                        $from  = " INNER JOIN wp_usermeta AS network_meta ON (wp_users.ID = network_meta.user_id)";
+                        $where = " AND ( (network_meta.meta_key = '" . $wpdb->get_blog_prefix( $blog_id ) . "capabilities'  ) )";
+                }
+
                 $meta_query = new WP_Meta_Query();
                 $meta_query->parse_query_vars( $qv );
 

tests/phpunit/tests/user/query.php

@@ -137 +137 @@
                 $query->prepare_query();
                 $this->assertEquals( $_query_vars, $query->query_vars );
         }
+
+        /**
+         * @ticket 22212
+         */
+        function test_get_single_role_by_user_query() {
+                $this->factory->user->create_many( 2, array(
+                                'role' => 'subscriber'
+                ) );
+
+                $wp_user_search = new WP_User_Query( array( 'role' => 'subscriber' ) );
+                $users          = $wp_user_search->get_results();
+                $this->assertEquals( 2, count( $users ) );
+        }
+
+        /**
+         * @ticket 22212
+         */
+        function test_get_multiple_roles_by_user_query() {
+                $this->factory->user->create_many( 2, array(
+                                'role' => 'subscriber'
+                ) );
+
+                $this->factory->user->create_many( 3, array(
+                                'role' => 'editor'
+                ) );
+
+                $wp_user_search = new WP_User_Query( array( 'role' => array( 'subscriber', 'editor' ) ) );
+                $users          = $wp_user_search->get_results();
+                $this->assertEquals( 5, count( $users ) );
+        }
+
+        /**
+         * @ticket 22212
+         */
+        function test_get_single_role_by_string() {
+                $this->factory->user->create_many( 2, array(
+                                'role' => 'subscriber'
+                ) );
+
+                $users = get_users( array(
+                                'role' => 'subscriber'
+                ) );
+
+                $this->assertEquals( 2, count( $users ) );
+        }
+
+        /**
+         * @ticket 22212
+         */
+        function test_get_single_role_by_array() {
+                $this->factory->user->create_many( 2, array(
+                                'role' => 'subscriber'
+                ) );
+
+                $users = get_users( array(
+                                'role' => array( 'subscriber' )
+                ) );
+
+                $this->assertEquals( 2, count( $users ) );
+        }
+
+        /**
+         * @ticket 22212
+         */
+        function test_get_multiple_roles() {
+                $this->factory->user->create_many( 2, array(
+                                'role' => 'subscriber'
+                ) );
+
+                $this->factory->user->create_many( 3, array(
+                                'role' => 'editor'
+                ) );
+
+                $this->factory->user->create_many( 2, array(
+                                'role' => 'administrator'
+                ) );
+
+                $users = new WP_User_Query( array( 'role' => array( 'subscriber', 'editor' ) ) );
+                $users = $users->get_results();
+
+                $this->assertEquals( 5, count( $users ) );
+                foreach ( $users as $user ) {
+                        $this->assertInstanceOf( 'WP_User', $user );
+                }
+        }
+
+        /**
+         * @ticket 22212
+         */
+        function test_get_multiple_roles_with_meta() {
+
+                // Create administrator user + meta
+                $administrator_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+                update_user_meta( $administrator_id, 'mk1', 1 );
+                update_user_meta( $administrator_id, 'mk2', 1 );
+
+                // Create editor user + meta
+                $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
+                update_user_meta( $editor_id, 'mk1', 1 );
+                update_user_meta( $editor_id, 'mk2', 2 );
+
+                // Create subscriber user + meta
+                $subscriber_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+                update_user_meta( $subscriber_id, 'mk1', 1 );
+                update_user_meta( $subscriber_id, 'mk2', 1 );
+
+                // Fetch users
+                $users = get_users( array(
+                                'role'       => array( 'administrator', 'editor', 'subscriber' ),
+                                'meta_query' => array(
+                                                'relation' => 'AND',
+                                                array(
+                                                                'key'     => 'mk1',
+                                                                'value'   => '1',
+                                                                'compare' => "=",
+                                                                'type'    => 'numeric'
+                                                ),
+                                                array(
+                                                                'key'     => 'mk2',
+                                                                'value'   => '2',
+                                                                'compare' => "=",
+                                                                'type'    => 'numeric'
+                                                )
+                                )
+                ) );
+
+                // Check results
+                $this->assertEquals( 1, count( $users ) );
+
+        }
+
 }