Ticket #32651: 32651.diff

src/wp-includes/link-template.php

@@ -1636 +1636 @@
         }
 
         $adjacent = $previous ? 'previous' : 'next';
-        $op = $previous ? '<' : '>';
+        $date_compare = $previous ? '<=' : '>=';
+        $id_compare = '!=';
         $order = $previous ? 'DESC' : 'ASC';
 
         /**
@@ -1683 +1684 @@
          * @param string $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
          * @param WP_Post $post           WP_Post object.
          */
-        $where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post );
-
+        $where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $date_compare %s AND p.ID $id_compare %d AND p.post_type = %s $where", $current_post_date, $post->ID, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post );
         /**
          * Filter the ORDER BY clause in the SQL for an adjacent post query.
          *
@@ -1697 +1697 @@
          * @param string $order_by The `ORDER BY` clause in the SQL.
          * @param WP_Post $post    WP_Post object.
          */
-        $sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post );
+        $sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order, p.ID $order LIMIT 1" );
 
         $query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
         $query_key = 'adjacent_post_' . md5( $query );

tests/phpunit/tests/link.php

@@ -310 +310 @@
                 $this->assertEquals( $p3, $found->ID );
         }
 
+        /**
+         * @ticket 32651
+         */
+        function test_get_adjacent_post_same_date_time() {
+                $one = $this->factory->post->create_and_get( array(
+                        'post_date' => '2012-01-01 12:00:00',
+                ) );
+
+                $two = $this->factory->post->create_and_get( array(
+                        'post_date' => '2012-01-01 12:00:00',
+                ) );
+
+                $three = $this->factory->post->create_and_get( array(
+                        'post_date' => '2012-01-01 12:00:00',
+                ) );
+
+                $this->go_to( get_permalink( $two ) );
+
+                $this->assertEquals( $three, get_adjacent_post( false, array(), false ) );
+                $this->assertEquals( $one, get_adjacent_post( false, array(), true ) );
+        }
+
         public function test_wp_make_link_relative_with_http_scheme() {
                 $link = 'http://example.com/this-is-a-test-http-url/';
                 $relative_link = wp_make_link_relative( $link );