Ticket #41826: 41826.2.patch

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

@@ -632 +632 @@
 
                 $number = absint( $this->query_vars['number'] );
                 $offset = absint( $this->query_vars['offset'] );
-                $paged = absint( $this->query_vars['paged'] );
+                $paged  = absint( $this->query_vars['paged'] );
 
-                if ( ! empty( $number ) ) {
-                        if ( $offset ) {
-                                $limits = 'LIMIT ' . $offset . ',' . $number;
+                // Limit
+                if ( $number > 0 ) {
+                        if ( $offset > 0 ) {
+                                $calc_offset = $offset; 
+                        } elseif( $paged > 0 ) { 
+                                $calc_offset = $number * ( $paged - 1 );    
                         } else {
-                                $limits = 'LIMIT ' . ( $number * ( $paged - 1 ) ) . ',' . $number;
+                                $calc_offset = 0; 
                         }
+                        $limits = $wpdb->prepare( "LIMIT %d, %d", $calc_offset, $number ); 
                 }
 
+
+
                 if ( $this->query_vars['count'] ) {
                         $fields = 'COUNT(*)';
                 } else {

tests/phpunit/tests/comment/query.php

@@ -1635 +1635 @@
                 $this->assertSame( $expected, $found );
         }
 
+        /**
+         * @ticket 41826
+         */
+        public function test_paged_zero_should_be_same_as_paged_one() {
+
+                $query0 = new WP_Comment_Query();
+                $found0 = $query0->query( array(
+                        'paged'         => 0,
+                        'number'        => 2,
+                ) );
+
+                $query1 = new WP_Comment_Query();
+                $found1 = $query1->query( array(
+                        'paged'         => 1,
+                        'number'        => 2,
+                ) );
+
+                $this->assertSame( $query0->request, $query1->request );
+        }
+
         public function test_post_type_single_value() {
                 register_post_type( 'post-type-1' );
                 register_post_type( 'post-type-2' );