Ticket #39061: 39061-comments.diff

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -235 +235 @@
                 }
 
                 if ( isset( $registered['page'] ) && empty( $request['offset'] ) ) {
-                        $prepared_args['offset'] = $prepared_args['number'] * ( absint( $request['page'] ) - 1 );
+                        $prepared_args['offset'] = $prepared_args['number'] * ( $request['page'] - 1 );
                 }
 
                 /**
@@ -278 +278 @@
                         $max_pages = ceil( $total_comments / $request['per_page'] );
                 }
 
+                if ( $request['page'] > $max_pages && $total_comments > 0 ) {
+                        return new WP_Error( 'rest_comment_invalid_page_number', __( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) );
+                }
+
                 $response = rest_ensure_response( $comments );
                 $response->header( 'X-WP-Total', $total_comments );
                 $response->header( 'X-WP-TotalPages', $max_pages );

tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -469 +469 @@
                 // 'offset' takes priority over 'page'
                 $request->set_param( 'page', 3 );
                 $response = $this->server->dispatch( $request );
-                $this->assertCount( 2, $response->get_data() );
+                $headers = $response->get_headers();
+                $this->assertErrorResponse( 'rest_comment_invalid_page_number', $response, 400 );
+
                 // 'offset' with invalid value errors.
                 $request->set_param( 'offset', 'moreplease' );
                 $response = $this->server->dispatch( $request );
@@ -731 +733 @@
                 $request->set_param( 'page', 8 );
                 $response = $this->server->dispatch( $request );
                 $headers = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
-                $prev_link = add_query_arg( array(
-                        'page'    => 6,
-                        ), rest_url( '/wp/v2/comments' ) );
-                $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-                $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+                $this->assertErrorResponse( 'rest_comment_invalid_page_number', $response, 400 );
         }
 
         public function test_get_comments_invalid_date() {