Ticket #54769: 54769.diff

src/wp-includes/link-template.php

@@ -1837 +1837 @@
 
         if ( $in_same_term || ! empty( $excluded_terms ) ) {
                 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";
+                        $join  .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy AS 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 ) ) {

src/wp-includes/taxonomy.php

@@ -2533 +2533 @@
          * and term_taxonomy_id of the older term instead. Then return out of the function so that the "create" hooks
          * are not fired.
          */
-        $duplicate_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.term_id, t.slug, tt.term_taxonomy_id, tt.taxonomy FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON ( tt.term_id = t.term_id ) WHERE t.slug = %s AND tt.parent = %d AND tt.taxonomy = %s AND t.term_id < %d AND tt.term_taxonomy_id != %d", $slug, $parent, $taxonomy, $term_id, $tt_id ) );
+        $duplicate_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.term_id, t.slug, tt.term_taxonomy_id, tt.taxonomy FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON ( tt.term_id = t.term_id ) WHERE t.slug = %s AND tt.parent = %d AND tt.taxonomy = %s AND t.term_id < %d AND tt.term_taxonomy_id != %d", $slug, $parent, $taxonomy, $term_id, $tt_id ) );
 
         /**
          * Filters the duplicate term check that takes place during term creation.