Changeset 53336

Timestamp:

05/03/2022 02:31:12 PM (2 years ago)

Author:

hellofromTonya

Message:

Editor: Sets 'paged' query arg only when there are comments: build_comment_query_vars_from_block().

A SQL syntax error happened when a post has no comments and "Break comments into pages" is checked in Settings > Discussion. The fix sets the 'paged' query arg only when there are comments. When there are no comments, WP_Comment_Query sets the default 'paged' value to 1.

Props bernhard-reiter, luisherranz, czapla, cbravobernal, davidbaumwald, hellofromTonya.

Follow-up to [53142], [53138].
Fixes #55658.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (1 diff)
• tests/phpunit/tests/blocks/renderCommentTemplate.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -1326 +1326 @@
                 $comment_args['paged'] = 1;
             } elseif ( 'newest' === $default_page ) {
-                $comment_args['paged'] = (int) ( new WP_Comment_Query( $comment_args ) )->max_num_pages;
+                $max_num_pages = (int) ( new WP_Comment_Query( $comment_args ) )->max_num_pages;
+                if ( 0 !== $max_num_pages ) {
+                    $comment_args['paged'] = $max_num_pages;
+                }
             }
             // Set the `cpage` query var to ensure the previous and next pagination links are correct

trunk/tests/phpunit/tests/blocks/renderCommentTemplate.php

@@ -137 +137 @@
         );
     }
+
+    /**
+     * Test that if pagination is set to display the last page by default (i.e. newest comments),
+     * the query is set to look for page 1 (rather than page 0, which would cause an error).
+     *
+     * Regression: https://github.com/WordPress/gutenberg/issues/40758.
+     *
+     * @ticket 55658
+     * @covers ::build_comment_query_vars_from_block
+     */
+    function test_build_comment_query_vars_from_block_pagination_with_no_comments() {
+        $comments_per_page     = get_option( 'comments_per_page' );
+        $default_comments_page = get_option( 'default_comments_page' );
+
+        update_option( 'comments_per_page', 50 );
+        update_option( 'previous_default_page', 'newest' );
+
+        $post_without_comments = self::factory()->post->create_and_get(
+            array(
+                'post_type'    => 'post',
+                'post_status'  => 'publish',
+                'post_name'    => 'fluffycat',
+                'post_title'   => 'Fluffy Cat',
+                'post_content' => 'Fluffy Cat content',
+                'post_excerpt' => 'Fluffy Cat',
+            )
+        );
+
+        $parsed_blocks = parse_blocks(
+            '<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
+        );
+
+        $block = new WP_Block(
+            $parsed_blocks[0],
+            array(
+                'postId' => $post_without_comments->ID,
+            )
+        );
+
+        $this->assertSameSetsWithIndex(
+            array(
+                'orderby'       => 'comment_date_gmt',
+                'order'         => 'ASC',
+                'status'        => 'approve',
+                'no_found_rows' => false,
+                'post_id'       => $post_without_comments->ID,
+                'hierarchical'  => 'threaded',
+                'number'        => 50,
+            ),
+            build_comment_query_vars_from_block( $block )
+        );
+
+        update_option( 'comments_per_page', $comments_per_page );
+        update_option( 'default_comments_page', $default_comments_page );
+    }
+
 
     /**