Ticket #35082: adj-post-fix.diff

wp-includes/link-template.php

@@ -1486 +1486 @@
         $where = '';
 
         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 "
                         if ( false !== strpos( $excluded_terms, ' and ' ) ) {
@@ -1502 +1499 @@
                 }
 
                 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 '';
-                        $term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+
+                        // Get all fields rather than just IDs, so we have access to parent ID
+                        $term_objects = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'all' ) );
+
+                        // Seperated WP error check from empty check as needs to run earlier
+                        if( is_wp_error( $term_objects ) )
+                                return '';
+
+                        // Loop over our terms and store the IDs
+                        $term_ids = array();
+                        foreach( $term_objects as $term )
+                                $term_ids[] = (int) $term->term_id;
+
+                        // Loop over the terms and if a terms parent exists, remove the parent
+                        foreach( $term_objects as $term ) {
+                                if( $term_parent = in_array($term->parent, $term_ids) )
+                                        unset($term_ids[$term_parent]);
+                        }
 
                         // Remove any exclusions from the term array to include.
-                        $term_array = array_diff( $term_array, (array) $excluded_terms );
-                        $term_array = array_map( 'intval', $term_array );
+                        $term_ids = array_diff( $term_ids, (array) $excluded_terms );
 
-                        if ( ! $term_array || is_wp_error( $term_array ) )
+                        // If the term objects array is now empty
+                        if ( ! $term_objects )
                                 return '';
 
-                        $where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+                        $where .= " AND tt.term_id IN (" . implode( ',', $term_ids ) . ")";
                 }
 
                 if ( ! empty( $excluded_terms ) ) {