Ticket #17582: 17582.3.diff

wp-includes/user.php

@@ -360 +360 @@
         var $query_where;
         var $query_orderby;
         var $query_limit;
+        var $query_groupby = '';
 
 
         /**
@@ -517 +518 @@
                         $clauses = $meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
                         $this->query_from .= $clauses['join'];
                         $this->query_where .= $clauses['where'];
+                        $this->query_groupby = 'group by ID';
                 }
 
                 if ( !empty( $qv['include'] ) ) {
@@ -540 +542 @@
                 global $wpdb;
 
                 if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
-                        $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
+                        $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_groupby $this->query_orderby $this->query_limit");
                 } else {
-                        $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
+                        $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_groupby $this->query_orderby $this->query_limit");
                 }
 
                 if ( $this->query_vars['count_total'] )
-                        $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");
+                        $this->total_users = $wpdb->get_var("SELECT COUNT(DISTINCT ID) $this->query_from $this->query_where");
 
                 if ( !$this->results )
                         return;