Changeset 34088 for trunk/src/wp-includes/link-template.php

Timestamp:

09/12/2015 08:33:07 PM (10 years ago)

Author:

boonebgorges

Message:

Remove extraneous table join in get_adjacent_post().

Since [29248], a table join has not been necessary to process the
$excluded_terms parameter of get_adjacent_post(). Aside from adding extra
overhead, this join meant that post records that don't have any corresponding
rows in wp_term_relationships were erroneously excluded from results.

Fixes #32833.

File:

• trunk/src/wp-includes/link-template.php (modified) (2 diffs)

trunk/src/wp-includes/link-template.php

@@ -1493 +1493 @@
 
     if ( $in_same_term || ! empty( $excluded_terms ) ) {
-        $join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-        $where = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
-
         if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
             // back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
@@ -1509 +1506 @@
 
         if ( $in_same_term ) {
+            $join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
+            $where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+
             if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
                 return '';