Ticket #38268: 38268.2.patch

src/wp-includes/class-wp-comment-query.php

@@ -183 +183 @@
          *                                                   See WP_Meta_Query. Default empty.
          *     @type int          $number                    Maximum number of comments to retrieve.
          *                                                   Default empty (no limit).
+         *     @type int          $paged                     When used with number, defines the page of results to return.
+         *                                                   Default 1.
          *     @type int          $offset                    Number of comments to offset the query. Used to build
          *                                                   LIMIT clause. Default 0.
          *     @type bool         $no_found_rows             Whether to disable the `SQL_CALC_FOUND_ROWS` query.
@@ -276 +278 @@
                         'no_found_rows' => true,
                         'orderby' => '',
                         'order' => 'DESC',
+                        'paged' => '1',
                         'parent' => '',
                         'parent__in' => '',
                         'parent__not_in' => '',
@@ -640 +643 @@
 
                 $number = absint( $this->query_vars['number'] );
                 $offset = absint( $this->query_vars['offset'] );
+                $paged = absint( $this->query_vars['paged'] );
 
                 if ( ! empty( $number ) ) {
                         if ( $offset ) {
                                 $limits = 'LIMIT ' . $offset . ',' . $number;
                         } else {
-                                $limits = 'LIMIT ' . $number;
+                                $limits = 'LIMIT ' . ( $number * ( $paged - 1 ) ) . ',' . $number;
                         }
                 }
 

tests/phpunit/tests/comment/query.php

@@ -1561 +1561 @@
                 $this->assertEquals( 2, $found );
         }
 
+        /**
+         * @ticket 38268
+         */
+        public function test_pagination_query() {
+                $comments = self::factory()->comment->create_many( 4, array(
+                        'comment_post_ID' => self::$post_id,
+                ) );
+
+                $query1 = new WP_Comment_Query();
+                $found1 = $query1->query( array(
+                        'paged' => 2,
+                        'number' => 2
+                ) );
+
+                $query2 = new WP_Comment_Query();
+                $found2 = $query2->query(
+                        array(
+                                'offset' => 2,
+                                'number' => 2
+                        )
+                );
+                $this->assertEqualSets( $found1, $found2 );
+        }
+
+        /**
+         * @ticket 38268
+         */
+        public function test_pagination_offset_conflict() {
+                $comments = self::factory()->comment->create_many( 4, array(
+                        'comment_post_ID' => self::$post_id,
+                ) );
+                $query1 = new WP_Comment_Query();
+                $found1 = $query1->query( array(
+                        'paged' => 2,
+                        'offset' => 1,
+                        'number' => 2
+                ) );
+
+                $query2 = new WP_Comment_Query();
+                $found2 = $query2->query(
+                        array(
+                                'offset' => 1,
+                                'number' => 2
+                        )
+                );
+                $this->assertEqualSets( $found1, $found2 );
+        }
+
         public function test_post_type_single_value() {
                 register_post_type( 'post-type-1' );
                 register_post_type( 'post-type-2' );