Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Comment template: Call comment_class() before recursing into child comments #40455

Merged
merged 5 commits into from
Apr 20, 2022
Merged

Comment template: Call comment_class() before recursing into child comments #40455

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d482af5
Call comment_class() before recursing into child comments
michalczaplinski Apr 20, 2022
0cd40c0
Update the comment
michalczaplinski Apr 20, 2022
72d708f
Standards-compliant multiline comment
ockham Apr 20, 2022
eaf6958
Line break in comment
ockham Apr 20, 2022
6657aba
Moar line break
ockham Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/block-library/src/comment-template/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
/**
* Function that recursively renders a list of nested comments.
*
* @global int $comment_depth
*
* @param WP_Comment[] $comments The array of comments.
* @param WP_Block $block Block instance.
* @return string
Expand All @@ -31,6 +33,14 @@ function block_core_comment_template_render_comments( $comments, $block ) {

$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.
ockham marked this conversation as resolved.
Show resolved Hide resolved
$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.
if ( ! empty( $children ) ) {
Expand All @@ -43,10 +53,6 @@ function block_core_comment_template_render_comments( $comments, $block ) {
$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 );
}

Expand Down