Changeset 38740

Timestamp:

10/06/2016 05:41:51 PM (8 years ago)

Author:

rachelbaker

Message:

Comments: Account for the comment_order option in get_page_of_comment().

Use the value of the comment_order setting to determine the date_query key to pass to WP_Comment_Query.
Fixes a bug where sites that had comments ordered "newest" first would have the incorrect page number returned.

Props tyxla, boonebgorges.
Fixes #31101.

Location:

trunk

Files:

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

trunk/src/wp-includes/comment.php

@@ -919 +919 @@
             return get_page_of_comment( $comment->comment_parent, $args );
 
+        if ( 'desc' === get_option( 'comment_order' ) ) {
+            $compare = 'after';
+        } else {
+            $compare = 'before';
+        }
+
         $comment_args = array(
             'type'       => $args['type'],
@@ -929 +935 @@
                 array(
                     'column' => "$wpdb->comments.comment_date_gmt",
-                    'before' => $comment->comment_date_gmt,
+                    $compare => $comment->comment_date_gmt,
                 )
             ),

trunk/tests/phpunit/tests/comment/getPageOfComment.php

@@ -239 +239 @@
         $this->assertEquals( 2, get_page_of_comment( $c1 ) );
     }
+
+    /**
+     * @ticket 31101
+     */
+    public function test_should_respect_comment_order_newest() {
+        $now = time();
+
+        $p = self::factory()->post->create();
+        $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+        $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
+        $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
+
+        update_option( 'comment_order', 'desc' );
+        update_option( 'page_comments', 1 );
+        update_option( 'comments_per_page', 2 );
+
+        $this->assertEquals( 2, get_page_of_comment( $c3 ) );
+    }
 }