Changeset 42828

Timestamp:

03/11/2018 05:31:04 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Link Template: Apply get_{$adjacent}_post_excluded_terms filter to an empty excluded_terms parameter as well.

Props soulseekah, zottto.
Fixes #43521.

Location:

trunk

Files:

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

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

@@ -1683 +1683 @@
         $adjacent = $previous ? 'previous' : 'next';
 
+        /**
+         * Filters 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 ( $in_same_term || ! empty( $excluded_terms ) ) {
                 if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
@@ -1715 +1727 @@
                         $where .= ' AND tt.term_id IN (' . implode( ',', $term_array ) . ')';
                 }
-
-                /**
-                 * Filters 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 ) ) {

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

@@ -247 +247 @@
          * @ticket 35211
          */
-        public function test_excluded_terms_filter() {
+        public function test_get_adjacent_post_excluded_terms_filter() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
@@ -277 +277 @@
         }
 
+        /**
+         * @ticket 43521
+         */
+        public function test_get_adjacent_post_excluded_terms_filter_should_apply_to_empty_excluded_terms_parameter() {
+                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( false, 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;