Changeset 36078

Timestamp:

12/23/2015 07:56:32 PM (11 years ago)

Author:

boonebgorges

Message:

Move excluded_terms filter in get_adjacent_post().

The filter was added in 4.4 [34528] #9571, but in a place where it could not
affect the adjacent post query.

Fixes #35211.

Location:

trunk

Files:

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

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

@@ -1569 +1569 @@
         $join = '';
         $where = '';
+        $adjacent = $previous ? 'previous' : 'next';
 
         if ( $in_same_term || ! empty( $excluded_terms ) ) {
@@ -1600 +1601 @@
                         $where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
                 }
+
+                /**
+                 * Filter the IDs of terms excluded from adjacent post queries.
+                 *
+                 * The dynamic portion of the hook name, `$adjacent`, refers to the type
+                 * of adjacency, 'next' or 'previous'.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $excluded_terms Array of excluded term IDs.
+                 */
+                $excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
 
                 if ( ! empty( $excluded_terms ) ) {
@@ -1636 +1649 @@
         }
 
-        $adjacent = $previous ? 'previous' : 'next';
         $op = $previous ? '<' : '>';
         $order = $previous ? 'DESC' : 'ASC';
-
-        /**
-         * Filter the excluded term ids
-         *
-         * The dynamic portion of the hook name, `$adjacent`, refers to the type
-         * of adjacency, 'next' or 'previous'.
-         *
-         * @since 4.4.0
-         *
-         * @param string $excluded_terms Array of excluded term IDs.
-         */
-        $excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
 
         /**

trunk/tests/phpunit/tests/link/getAdjacentPost.php

@@ -5 +5 @@
  */
 class Tests_Link_GetAdjacentPost extends WP_UnitTestCase {
+        protected $exclude_term;
+
         /**
          * @ticket 17807
@@ -211 +213 @@
                 $this->assertEquals( $p3, $found->ID );
         }
+
+        /**
+         * @ticket 35211
+         */
+        public function test_excluded_terms_filter() {
+                register_taxonomy( 'wptests_tax', 'post' );
+
+                $terms = self::factory()->term->create_many( 2, array(
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $p1 = self::factory()->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
+
+                wp_set_post_terms( $p1, array( $terms[0], $terms[1] ), 'wptests_tax' );
+                wp_set_post_terms( $p2, array( $terms[1] ), 'wptests_tax' );
+                wp_set_post_terms( $p3, array( $terms[0] ), 'wptests_tax' );
+
+                $this->go_to( get_permalink( $p1 ) );
+
+                $this->exclude_term = $terms[1];
+                add_filter( 'get_previous_post_excluded_terms', array( $this, 'filter_excluded_terms' ) );
+
+                $found = get_adjacent_post( true, array(), true, 'wptests_tax' );
+
+                remove_filter( 'get_previous_post_excluded_terms', array( $this, 'filter_excluded_terms' ) );
+                unset( $this->exclude_term );
+
+                $this->assertSame( $p3, $found->ID );
+        }
+
+        public function filter_excluded_terms( $excluded_terms ) {
+                $excluded_terms[] = $this->exclude_term;
+                return $excluded_terms;
+        }
 }