Comments: Fix fatal when comment form defaults are null (#53860)

Author: arcangelini

projects/packages/comments/changelog/fix-comment-form-defaults-null

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix fatal errors when another plugin or theme returns an empty value from a comment form or comment content filter.

projects/packages/comments/src/editor/class-block-editor.php

@@ -181,8 +181,8 @@ private static function restore( array $blocks, &$images = 0 ) {
 	/**
 	 * Let the tags these blocks save through kses, for a comment that holds them.
 	 *
-	 * @param array  $tags    Allowed tags.
-	 * @param string $context The kses context.
+	 * @param array|mixed $tags    Allowed tags. Null when an earlier filter drops them.
+	 * @param string      $context The kses context.
 	 * @return array
 	 */
 	public function allowed_html( $tags, $context ) {
@@ -191,7 +191,7 @@ public function allowed_html( $tags, $context ) {
 		}
 
 		return array_merge(
-			$tags,
+			(array) $tags,
 			array(
 				'p'          => array(),
 				'br'         => array(),
@@ -218,12 +218,12 @@ public function allowed_html( $tags, $context ) {
 	/**
 	 * The comment's HTML without the block delimiters, and without any block the editor does not offer.
 	 *
-	 * @param string           $content Comment content.
+	 * @param string|mixed     $content Comment content.
 	 * @param \WP_Comment|null $comment The comment, where the caller has it.
-	 * @return string
+	 * @return string|mixed
 	 */
 	public static function render( $content, $comment = null ) {
-		if ( ! has_blocks( $content ) ) {
+		if ( ! is_string( $content ) || ! has_blocks( $content ) ) {
 			return $content;
 		}
 
@@ -237,11 +237,15 @@ public static function render( $content, $comment = null ) {
 	/**
 	 * Core's comment email, with the comment's block markup replaced by the text it draws.
 	 *
-	 * @param string $message    The email body.
-	 * @param int    $comment_id The comment the email is about.
-	 * @return string
+	 * @param string|mixed $message    The email body.
+	 * @param int          $comment_id The comment the email is about.
+	 * @return string|mixed
 	 */
 	public static function render_in_email( $message, $comment_id ) {
+		if ( ! is_string( $message ) ) {
+			return $message;
+		}
+
 		$comment = get_comment( $comment_id );
 
 		if ( ! $comment instanceof \WP_Comment || ! has_blocks( $comment->comment_content ) ) {

projects/packages/comments/src/form/class-comment-form.php

@@ -163,7 +163,7 @@ public function comment_form_logged_in( $logged_in_as ) {
 	/**
 	 * Set the form arguments the app reads back out.
 	 *
-	 * @param array $args Comment form arguments.
+	 * @param array|mixed $args Comment form arguments. Null when an earlier filter drops them.
 	 * @return array
 	 */
 	public function comment_form_defaults( $args ) {
@@ -183,7 +183,7 @@ public function comment_form_defaults( $args ) {
 			$defaults['title_reply'] = $greeting;
 		}
 
-		$this->defaults = array_merge( $args, $defaults );
+		$this->defaults = array_merge( (array) $args, $defaults );
 
 		return $this->defaults;
 	}