Changeset 30263

Timestamp:

11/06/2014 08:11:34 PM (10 years ago)

Author:

boonebgorges

Message:

In get_adjacent_post(), $excluded_terms should check term_id rather than term_taxonom_id.

See #29663, #22112.

Location:

trunk

Files:

• src/wp-includes/link-template.php (modified) (1 diff)
• tests/phpunit/tests/link.php (modified) (1 diff)

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

@@ -1514 +1514 @@
 
         if ( ! empty( $excluded_terms ) ) {
-            $where .= " AND p.ID NOT IN ( SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . implode( $excluded_terms, ',' ) . ') )';
+            $where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( $excluded_terms, ',' ) . ') )';
         }
     }

trunk/tests/phpunit/tests/link.php

@@ -191 +191 @@
 
     /**
-    * @ticket 22112
-    */
+     * @ticket 22112
+     */
     function test_get_adjacent_post_exclude_self_term() {
-        $include = $this->factory->category->create();
+        // Bump term_taxonomy to mimic shared term offsets.
+        global $wpdb;
+        $wpdb->insert( $wpdb->term_taxonomy, array( 'taxonomy' => 'foo', 'term_id' => 12345 ) );
+
+        $include = $this->factory->term->create( array(
+            'taxonomy' => 'category',
+            'name' => 'Include',
+        ) );
         $exclude = $this->factory->category->create();