From 64466d3c35fcbb8901434fdf9a2340e021dde523 Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Tue, 21 Feb 2023 15:26:10 +0000 Subject: [PATCH] Comments: Restore global $comment assignment in comment_form_title(). Restores the global `$comment` assignment in `comment_form_title()`, which was mistakely removed in [55369]. As noted in the function's DocBlock: {{{ @internal The $comment global must be present to allow template tags access to the current comment. See https://core.trac.wordpress.org/changeset/36512. }}} Follow-up to [55369]. Props hellofromTonya, costdev. Fixes #53962. git-svn-id: https://develop.svn.wordpress.org/trunk@55395 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/comment-template.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php index 06b2ce2397..d5b7dc1833 100644 --- a/src/wp-includes/comment-template.php +++ b/src/wp-includes/comment-template.php @@ -2034,6 +2034,8 @@ function comment_id_fields( $post = null ) { * @since 2.7.0 * @since 6.2.0 Added the `$post` parameter. * + * @global WP_Comment $comment Global comment object. + * * @param string|false $no_reply_text Optional. Text to display when not replying to a comment. * Default false. * @param string|false $reply_text Optional. Text to display when replying to a comment. @@ -2045,6 +2047,8 @@ function comment_id_fields( $post = null ) { * Defaults to the current global post. */ function comment_form_title( $no_reply_text = false, $reply_text = false, $link_to_parent = true, $post = null ) { + global $comment; + if ( false === $no_reply_text ) { $no_reply_text = __( 'Leave a Reply' ); } @@ -2067,6 +2071,9 @@ function comment_form_title( $no_reply_text = false, $reply_text = false, $link_ return; } + // Sets the global so that template tags can be used in the comment form. + $comment = get_comment( $reply_to_id ); + if ( $link_to_parent ) { $author = '' . get_comment_author( $reply_to_id ) . ''; } else {