Changeset 53298

Timestamp:

04/28/2022 01:16:18 AM (2 years ago)

Author:

peterwilsoncc

Message:

Editor: Show comment previews in the Comment Query Loop.

Update build_comment_query_vars_from_block() to show previews of unmoderated comments to the original author of the comment. This duplicates the existing logic in wp_list_comments().

Props darerodz, bernhard-reiter, czapla.
Fixes #55634.

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

@@ -1288 +1288 @@
 
     $comment_args = array(
-        'orderby'                   => 'comment_date_gmt',
-        'order'                     => 'ASC',
-        'status'                    => 'approve',
-        'no_found_rows'             => false,
-    );
+        'orderby'       => 'comment_date_gmt',
+        'order'         => 'ASC',
+        'status'        => 'approve',
+        'no_found_rows' => false,
+    );
+
+    if ( is_user_logged_in() ) {
+        $comment_args['include_unapproved'] = array( get_current_user_id() );
+    } else {
+        $unapproved_email = wp_get_unapproved_comment_author_email();
+
+        if ( $unapproved_email ) {
+            $comment_args['include_unapproved'] = array( $unapproved_email );
+        }
+    }
 
     if ( ! empty( $block->context['postId'] ) ) {

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

@@ -251 +251 @@
         );
     }
+
+    /**
+     * Test that unapproved comments are included if it is a preview.
+     *
+     * @ticket 55634
+     * @covers ::build_comment_query_vars_from_block
+     */
+    function test_build_comment_query_vars_from_block_with_comment_preview() {
+        $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' => self::$custom_post->ID,
+            )
+        );
+
+        $commenter_filter = function () {
+            return array(
+                'comment_author_email' => 'unapproved@example.org',
+            );
+        };
+
+        add_filter( 'wp_get_current_commenter', $commenter_filter );
+
+        $this->assertEquals(
+            build_comment_query_vars_from_block( $block ),
+            array(
+                'orderby'            => 'comment_date_gmt',
+                'order'              => 'ASC',
+                'status'             => 'approve',
+                'no_found_rows'      => false,
+                'include_unapproved' => array( 'unapproved@example.org' ),
+                'post_id'            => self::$custom_post->ID,
+                'hierarchical'       => 'threaded',
+                'number'             => 5,
+                'paged'              => 1,
+            )
+        );
+    }
 }