Comments block: Fix glitches found while backporting (#40628)

WordPress · Apr 29, 2022 · e86188d · e86188d
1 parent 1f695c9
commit e86188d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/block-library/src/comments-title/index.php b/packages/block-library/src/comments-title/index.php
@@ -60,9 +60,9 @@ function render_block_core_comments_title( $attributes ) {
 	);
 }
 
-	/**
-	 * Registers the `core/comments-title` block on the server.
-	 */
+/**
+ * Registers the `core/comments-title` block on the server.
+ */
 function register_block_core_comments_title() {
 	register_block_type_from_metadata(
 		__DIR__ . '/comments-title',
@@ -72,4 +72,4 @@ function register_block_core_comments_title() {
 	);
 }
 
-	add_action( 'init', 'register_block_core_comments_title' );
+add_action( 'init', 'register_block_core_comments_title' );
diff --git a/packages/block-library/src/post-comments-form/index.php b/packages/block-library/src/post-comments-form/index.php
@@ -25,10 +25,14 @@ function render_block_core_post_comments_form( $attributes, $content, $block ) {
 
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
 
+	add_filter( 'comment_form_defaults', 'post_comments_form_block_form_defaults' );
+
 	ob_start();
 	comment_form( array(), $block->context['postId'] );
 	$form = ob_get_clean();
 
+	remove_filter( 'comment_form_defaults', 'post_comments_form_block_form_defaults' );
+
 	// We use the outermost wrapping `<div />` returned by `comment_form()`
 	// which is identified by its default classname `comment-respond` to inject
 	// our wrapper attributes. This way, it is guaranteed that all styling applied
@@ -70,4 +74,3 @@ function post_comments_form_block_form_defaults( $fields ) {
 
 	return $fields;
 }
-add_filter( 'comment_form_defaults', 'post_comments_form_block_form_defaults' );