From 1c3b5c9dc8224a632c2fd29fe8bcf8b1bf5de113 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 26 Jan 2020 22:29:06 +0000
Subject: [PATCH] Comments: Add `In reply to %s.` prefix to child comments in
 comments feed.

The prefix includes a link to the parent comment and the name of its author.

Props zodiac1978, imath, SergeyBiryukov.
Fixes #43429.
Built from https://develop.svn.wordpress.org/trunk@47111


git-svn-id: http://core.svn.wordpress.org/trunk@46911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-template.php | 19 ++++++++++++++++++-
 wp-includes/version.php          |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index a031c9a88c..0f58c1455a 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -949,6 +949,7 @@ function get_comments_number_text( $zero = false, $one = false, $more = false )
  *
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 5.4.0 Added 'In reply to %s.' prefix to child comments in comments feed.
  *
  * @see Walker_Comment::comment()
  *
@@ -960,6 +961,22 @@ function get_comments_number_text( $zero = false, $one = false, $more = false )
 function get_comment_text( $comment_ID = 0, $args = array() ) {
 	$comment = get_comment( $comment_ID );
 
+	$comment_content = $comment->comment_content;
+
+	if ( is_comment_feed() && $comment->comment_parent ) {
+		$parent = get_comment( $comment->comment_parent );
+		if ( $parent ) {
+			$parent_link = esc_url( get_comment_link( $parent ) );
+			$name        = get_comment_author( $parent );
+
+			$comment_content = sprintf(
+				/* translators: %s: Comment link. */
+				ent2ncr( __( 'In reply to %s.' ) ),
+				'<a href="' . $parent_link . '">' . $name . '</a>'
+			) . "\n\n" . $comment_content;
+		}
+	}
+
 	/**
 	 * Filters the text of a comment.
 	 *
@@ -971,7 +988,7 @@ function get_comment_text( $comment_ID = 0, $args = array() ) {
 	 * @param WP_Comment $comment         The comment object.
 	 * @param array      $args            An array of arguments.
 	 */
-	return apply_filters( 'get_comment_text', $comment->comment_content, $comment, $args );
+	return apply_filters( 'get_comment_text', $comment_content, $comment, $args );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3c150af2ff..2702082569 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47110';
+$wp_version = '5.4-alpha-47111';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.