Changeset 36004 for branches/4.4/src/wp-includes/taxonomy.php

Timestamp:

12/18/2015 05:48:33 PM (9 years ago)

Author:

boonebgorges

Message:

Ensure get_terms() results are unique when using 'meta_query'.

The introduction of 'meta_query' to get_terms() in 4.4 made it possible for
get_terms() to erroneously return duplicate results. To address the issue,
we add the DISTINCT keyword to the SQL query when a 'meta_query' parameter
has been provided.

Merges [36003] to the 4.4 branch.

Props @jadpm.
Fixes #35137.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/taxonomy.php (modified) (4 diffs)

branches/4.4/src/wp-includes/taxonomy.php

@@ -1354 +1354 @@
     // Meta query support.
     $join = '';
+    $distinct = '';
     if ( ! empty( $args['meta_query'] ) ) {
         $mquery = new WP_Meta_Query( $args['meta_query'] );
@@ -1360 +1361 @@
         $join  .= $mq_sql['join'];
         $where .= $mq_sql['where'];
+        $distinct .= "DISTINCT";
     }
 
@@ -1409 +1411 @@
     $join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
 
-    $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
+    $pieces = array( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
 
     /**
@@ -1425 +1427 @@
     $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
     $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
+    $distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
     $orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
     $order = isset( $clauses[ 'order' ] ) ? $clauses[ 'order' ] : '';
     $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
 
-    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
+    $query = "SELECT $distinct $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
 
     // $args can be anything. Only use the args defined in defaults to compute the key.