Changeset 18178

Timestamp:

06/07/2011 03:55:05 PM (14 years ago)

Author:

ryan

Message:

Use DISTINCT to eliminate duplicates when using an OR meta query relation. Props scribu, greuben. fixes #17582

File:

• trunk/wp-includes/user.php (modified) (4 diffs)

trunk/wp-includes/user.php

@@ -384 +384 @@
                 'orderby' => 'login',
                 'order' => 'ASC',
-                'offset' => '', 'number' => '',
+                'offset' => '',
+                'number' => '',
                 'count_total' => true,
                 'fields' => 'all',
@@ -418 +419 @@
             $this->query_fields = "$wpdb->users.ID";
         }
+
+        if ( $this->query_vars['count_total'] )
+            $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 
         $this->query_from = "FROM $wpdb->users";
@@ -518 +522 @@
             $this->query_from .= $clauses['join'];
             $this->query_where .= $clauses['where'];
+
+            if ( 'OR' == $meta_query->relation )
+                $this->query_fields = 'DISTINCT ' . $this->query_fields;
         }
 
@@ -547 +554 @@
 
         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( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
 
         if ( !$this->results )