Changeset 27692

Timestamp:

03/24/2014 09:29:14 PM (11 years ago)

Author:

nacin

Message:

Use the current post's post type when determining post adjacency.

props ethitter.
fixes #26937.

Location:

trunk

Files:

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

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

@@ -1294 +1294 @@
             'posts_per_page'      => 1,
             'post_status'         => 'publish',
-            'post_type'           => 'post',
+            'post_type'           => $this->current_post->post_type,
             'orderby'             => 'date',
             'order'               => 'previous' === $this->adjacent ? 'DESC' : 'ASC',

trunk/tests/phpunit/tests/link.php

@@ -176 +176 @@
         $post_one = $this->factory->post->create_and_get( array(
             'post_title' => 'First',
-            'post_date' => '2012-01-01 12:00:00'
+            'post_date'  => '2012-01-01 12:00:00',
         ) );
 
         $post_two = $this->factory->post->create_and_get( array(
             'post_title' => 'Second',
-            'post_date' => '2012-02-01 12:00:00'
+            'post_date'  => '2012-02-01 12:00:00',
         ) );
 
         $post_three = $this->factory->post->create_and_get( array(
             'post_title' => 'Third',
-            'post_date' => '2012-03-01 12:00:00'
+            'post_date'  => '2012-03-01 12:00:00',
         ) );
 
         $post_four = $this->factory->post->create_and_get( array(
             'post_title' => 'Fourth',
-            'post_date' => '2012-04-01 12:00:00'
+            'post_date'  => '2012-04-01 12:00:00',
+        ) );
+
+        // Use pages to test post-type adjacency
+        $page_one = $this->factory->post->create_and_get( array(
+            'post_title' => 'First Page',
+            'post_date'  => '2013-01-01 12:00:00',
+            'post_type'  => 'page',
+        ) );
+
+        $page_two = $this->factory->post->create_and_get( array(
+            'post_title' => 'Second Page',
+            'post_date'  => '2013-02-01 12:00:00',
+            'post_type'  => 'page',
         ) );
 
@@ -234 +247 @@
         $this->assertEquals( $post_three, get_adjacent_post( false, null, false ) );
         remove_filter( 'get_next_post_sort', array( $this, 'filter_next_post_sort_limit' ) );
+
+        // Test post-type specificity
+        $this->go_to( get_permalink( $page_one ) );
+        $this->assertEquals( $page_two, get_adjacent_post( false, null, false ) );
+
+        $this->go_to( get_permalink( $page_two ) );
+        $this->assertEquals( $page_one, get_adjacent_post( false, null, true ) );
     }