Changeset 30405

Timestamp:

11/20/2014 10:58:42 AM (10 years ago)

Author:

nacin

Message:

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

Merges [30263] (and [30264] [30401]) to the 4.0 branch.

props boonebgorges.
fixes #29663, see #22112.

Location:

branches/4.0

Files:

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

branches/4.0/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, ',' ) . ') )';
         }
     }

branches/4.0/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, 'description' => '' ) );
+
+        $include = $this->factory->term->create( array(
+            'taxonomy' => 'category',
+            'name' => 'Include',
+        ) );
         $exclude = $this->factory->category->create();