From c7552589033202246b4ad5d7f20b3bfbec71bcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Zi=C3=83=C2=B3=C3=85=E2=80=9Akowski?=
 <gziolo@git.wordpress.org>
Date: Tue, 19 Apr 2022 12:37:53 +0000
Subject: [PATCH] Editor: Fix Comment Query block isn't lazy loading meta data

Related GitHub issue: https://github.com/WordPress/gutenberg/issues/40241.
Primes comment meta data cache within calls to WP_Comment_Query.

Props peterwilsoncc, cbravobernal.
See #55567.
Follow-up [53138].




git-svn-id: https://develop.svn.wordpress.org/trunk@53214 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/blocks.php                    |  1 -
 .../tests/blocks/renderCommentTemplate.php    | 32 +++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index b59e76bcc6..f19648c2d6 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -1397,7 +1397,6 @@ function build_comment_query_vars_from_block( $block ) {
 		'order'                     => 'ASC',
 		'status'                    => 'approve',
 		'no_found_rows'             => false,
-		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
 
 	if ( ! empty( $block->context['postId'] ) ) {
diff --git a/tests/phpunit/tests/blocks/renderCommentTemplate.php b/tests/phpunit/tests/blocks/renderCommentTemplate.php
index a278dbfdd0..97ff1b8604 100644
--- a/tests/phpunit/tests/blocks/renderCommentTemplate.php
+++ b/tests/phpunit/tests/blocks/renderCommentTemplate.php
@@ -67,15 +67,14 @@ class Tests_Blocks_RenderReusableCommentTemplate extends WP_UnitTestCase {
 
 		$this->assertEquals(
 			array(
-				'orderby'                   => 'comment_date_gmt',
-				'order'                     => 'ASC',
-				'status'                    => 'approve',
-				'no_found_rows'             => false,
-				'update_comment_meta_cache' => false,
-				'post_id'                   => self::$custom_post->ID,
-				'hierarchical'              => 'threaded',
-				'number'                    => 5,
-				'paged'                     => 1,
+				'orderby'       => 'comment_date_gmt',
+				'order'         => 'ASC',
+				'status'        => 'approve',
+				'no_found_rows' => false,
+				'post_id'       => self::$custom_post->ID,
+				'hierarchical'  => 'threaded',
+				'number'        => 5,
+				'paged'         => 1,
 			),
 			build_comment_query_vars_from_block( $block )
 		);
@@ -94,14 +93,13 @@ class Tests_Blocks_RenderReusableCommentTemplate extends WP_UnitTestCase {
 
 		$this->assertEquals(
 			array(
-				'orderby'                   => 'comment_date_gmt',
-				'order'                     => 'ASC',
-				'status'                    => 'approve',
-				'no_found_rows'             => false,
-				'update_comment_meta_cache' => false,
-				'hierarchical'              => 'threaded',
-				'number'                    => 5,
-				'paged'                     => 1,
+				'orderby'       => 'comment_date_gmt',
+				'order'         => 'ASC',
+				'status'        => 'approve',
+				'no_found_rows' => false,
+				'hierarchical'  => 'threaded',
+				'number'        => 5,
+				'paged'         => 1,
 			),
 			build_comment_query_vars_from_block( $block )
 		);