Ticket #22212: user.php.2.patch

wp-includes/user.php

@@ -360 +360 @@
                 if ( !empty( $query ) ) {
                         $this->query_vars = wp_parse_args( $query, array(
                                 'blog_id' => $GLOBALS['blog_id'],
-                                'role' => '',
+                                'role' => array(),
                                 'meta_key' => '',
                                 'meta_value' => '',
                                 'meta_compare' => '',
@@ -492 +492 @@
                         $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
                 }
 
-                $role = trim( $qv['role'] );
+                $roles = array();
+                if( is_array( $qv[ 'role' ] ) ) {
+                        $roles = $qv[ 'role' ];
+                }else if( is_string( $qv[ 'role' ] ) && !empty( $qv[ 'role' ] ) ) {
+                        $roles = array( $qv[ 'role' ] );
+                }
 
-                if ( $blog_id && ( $role || is_multisite() ) ) {
-                        $cap_meta_query = array();
-                        $cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+                if ( $blog_id && ( !empty( $roles ) || is_multisite() ) ) {
 
-                        if ( $role ) {
-                                $cap_meta_query['value'] = '"' . $role . '"';
-                                $cap_meta_query['compare'] = 'like';
+                        // Add Roles query
+                        if( !empty( $roles ) ) {
+
+                                $from = '';
+                                $where = ' AND ( ';
+                                $roles_count = count($roles);
+                                for( $i = 0; $i < $roles_count; $i++ ) {
+                                        $alias = 'role_meta' . $i;
+                                        $from .= " INNER JOIN wp_usermeta AS {$alias} ON (wp_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 . '.*';
+
                         }
 
-                        $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();