Changeset 29248

Timestamp:

07/19/2014 10:26:43 PM (10 years ago)

Author:

wonderboymusic

Message:

In get_adjacent_post(), make $excluded_terms work as expected.

Adds unit tests.
Props jessepollak, kovshenin.
Fixes #22112.

Location:

trunk

Files:

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

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

@@ -1478 +1478 @@
 
     $join = '';
-    $posts_in_ex_terms_sql = '';
+    $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 ' ) ) {
+                _deprecated_argument( __FUNCTION__, '3.3', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
+                $excluded_terms = explode( ' and ', $excluded_terms );
+            } else {
+                $excluded_terms = explode( ',', $excluded_terms );
+            }
+
+            $excluded_terms = array_map( 'intval', $excluded_terms );
+        }
 
         if ( $in_same_term ) {
@@ -1486 +1500 @@
                 return '';
             $term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+
+            // 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 );
+
             if ( ! $term_array || is_wp_error( $term_array ) )
                 return '';
-            $join .= $wpdb->prepare( " AND tt.taxonomy = %s AND tt.term_id IN (" . implode( ',', array_map( 'intval', $term_array ) ) . ")", $taxonomy );
+
+            $where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
         }
 
-        $posts_in_ex_terms_sql = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
         if ( ! empty( $excluded_terms ) ) {
-            if ( ! is_array( $excluded_terms ) ) {
-                // back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
-                if ( false !== strpos( $excluded_terms, ' and ' ) ) {
-                    _deprecated_argument( __FUNCTION__, '3.3', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
-                    $excluded_terms = explode( ' and ', $excluded_terms );
-                } else {
-                    $excluded_terms = explode( ',', $excluded_terms );
-                }
-            }
-
-            $excluded_terms = array_map( 'intval', $excluded_terms );
-
-            if ( ! empty( $term_array ) ) {
-                $excluded_terms = array_diff( $excluded_terms, $term_array );
-                $posts_in_ex_terms_sql = '';
-            }
-
-            if ( ! empty( $excluded_terms ) ) {
-                $posts_in_ex_terms_sql = $wpdb->prepare( " AND tt.taxonomy = %s AND tt.term_id NOT IN (" . implode( $excluded_terms, ',' ) . ')', $taxonomy );
-            }
+            $where .= " AND p.ID NOT IN ( SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . implode( $excluded_terms, ',' ) . ') )';
         }
     }
@@ -1546 +1546 @@
      * @param array  $excluded_terms Array of excluded term IDs.
      */
-    $where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s AND p.post_status = 'publish' $posts_in_ex_terms_sql", $current_post_date, $post->post_type), $in_same_term, $excluded_terms );
+    $where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s AND p.post_status = 'publish' $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms );
 
     /**

trunk/tests/phpunit/tests/link.php

@@ -189 +189 @@
         $this->assertEquals( array( $post_four ), get_boundary_post( true, '', false, 'post_tag' ) );
     }
+
+    /**
+    * @ticket 22112
+    */
+    function test_get_adjacent_post_exclude_self_term() {
+        $include = $this->factory->category->create();
+        $exclude = $this->factory->category->create();
+
+        $one = $this->factory->post->create_and_get( array(
+            'post_date' => '2012-01-01 12:00:00',
+            'post_category' => array( $include, $exclude ),
+        ) );
+
+        $two = $this->factory->post->create_and_get( array(
+            'post_date' => '2012-01-02 12:00:00',
+            'post_category' => array(),
+        ) );
+
+        $three = $this->factory->post->create_and_get( array(
+            'post_date' => '2012-01-03 12:00:00',
+            'post_category' => array( $include, $exclude ),
+        ) );
+
+        $four = $this->factory->post->create_and_get( array(
+            'post_date' => '2012-01-04 12:00:00',
+            'post_category' => array( $include ),
+        ) );
+
+        $five = $this->factory->post->create_and_get( array(
+            'post_date' => '2012-01-05 12:00:00',
+            'post_category' => array( $include, $exclude ),
+        ) );
+
+        // First post
+        $this->go_to( get_permalink( $one ) );
+        $this->assertEquals( $two, get_adjacent_post( false, array(), false ) );
+        $this->assertEquals( $three, get_adjacent_post( true, array(), false ) );
+        $this->assertEquals( $two, get_adjacent_post( false, array( $exclude ), false ) );
+        $this->assertEquals( $four, get_adjacent_post( true, array( $exclude ), false ) );
+        $this->assertEmpty( get_adjacent_post( false, array(), true ) );
+
+        // Fourth post
+        $this->go_to( get_permalink( $four ) );
+        $this->assertEquals( $five, get_adjacent_post( false, array(), false ) );
+        $this->assertEquals( $five, get_adjacent_post( true, array(), false ) );
+        $this->assertEmpty( get_adjacent_post( false, array( $exclude ), false ) );
+        $this->assertEmpty( get_adjacent_post( true, array( $exclude ), false ) );
+
+        $this->assertEquals( $three, get_adjacent_post( false, array(), true ) );
+        $this->assertEquals( $three, get_adjacent_post( true, array(), true ) );
+        $this->assertEquals( $two, get_adjacent_post( false, array( $exclude ), true ) );
+        $this->assertEmpty( get_adjacent_post( true, array( $exclude ), true ) );
+
+        // Last post
+        $this->go_to( get_permalink( $five ) );
+        $this->assertEquals( $four, get_adjacent_post( false, array(), true ) );
+        $this->assertEquals( $four, get_adjacent_post( true, array(), true ) );
+        $this->assertEquals( $four, get_adjacent_post( false, array( $exclude ), true ) );
+        $this->assertEquals( $four, get_adjacent_post( true, array( $exclude ), true ) );
+        $this->assertEmpty( get_adjacent_post( false, array(), false ) );
+    }
 }