Changeset 53278 for trunk/src/wp-includes/blocks/comment-template.php

Timestamp:

04/26/2022 01:39:57 PM (3 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages for 6.0 Beta 3

Included cherry-picked commits from the Gutenberg plugin that fix bugs discovere after WordPress 6.0 Beta 2.

Props zieladam, ndiego.
See #55567.

File:

• trunk/src/wp-includes/blocks/comment-template.php (modified) (3 diffs)

trunk/src/wp-includes/blocks/comment-template.php

@@ -8 +8 @@
 /**
  * Function that recursively renders a list of nested comments.
+ *
+ * @global int $comment_depth
  *
  * @param WP_Comment[] $comments        The array of comments.
@@ -32 +34 @@
         $children = $comment->get_children();
 
+        /*
+         * We need to create the CSS classes BEFORE recursing into the children.
+         * This is because comment_class() uses globals like `$comment_alt`
+         * and `$comment_thread_alt` which are order-sensitive.
+         *
+         * The `false` parameter at the end means that we do NOT want the function
+         * to `echo` the output but to return a string.
+         * See https://developer.wordpress.org/reference/functions/comment_class/#parameters.
+         */
+        $comment_classes = comment_class( '', $comment->comment_ID, $comment->comment_post_ID, false );
+
         // If the comment has children, recurse to create the HTML for the nested
         // comments.
@@ -43 +56 @@
             $comment_depth -= 1;
         }
-
-        // The `false` parameter at the end means that we do NOT want the function to `echo` the output but to return a string.
-        // See https://developer.wordpress.org/reference/functions/comment_class/#parameters.
-        $comment_classes = comment_class( '', $comment->comment_ID, $comment->comment_post_ID, false );
 
         $content .= sprintf( '<li id="comment-%1$s" %2$s>%3$s</li>', $comment->comment_ID, $comment_classes, $block_content );