Ticket #35137: 35137.patch

wp-includes/taxonomy.php

@@ -1353 +1353 @@
 
         // Meta query support.
         $join = '';
+        $distinct = '';
         if ( ! empty( $args['meta_query'] ) ) {
                 $mquery = new WP_Meta_Query( $args['meta_query'] );
                 $mq_sql = $mquery->get_sql( 'term', 't', 'term_id' );
@@ -1359 +1360 @@
 
                 $join  .= $mq_sql['join'];
                 $where .= $mq_sql['where'];
+                $distinct .= "DISTINCT";
         }
 
         $selects = array();
@@ -1408 +1410 @@
 
         $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' );
 
         /**
          * Filter the terms query SQL clauses.
@@ -1424 +1426 @@
         $fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
         $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.
         $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $defaults ) ) ) . serialize( $taxonomies ) . $query );