diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/feed-rss2-comments.php
--- a/wp/wp-includes/feed-rss2-comments.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/feed-rss2-comments.php	Tue Dec 15 13:49:49 2020 +0100
@@ -35,13 +35,13 @@
 	<title>
 	<?php
 	if ( is_singular() ) {
-		/* translators: Comments feed title. %s: Post title */
+		/* translators: Comments feed title. %s: Post title. */
 		printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
 	} elseif ( is_search() ) {
-		/* translators: Comments feed title. 1: Site name, 2: Search query */
+		/* translators: Comments feed title. 1: Site title, 2: Search query. */
 		printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
 	} else {
-		/* translators: Comments feed title. %s: Site name */
+		/* translators: Comments feed title. %s: Site title. */
 		printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
 	}
 	?>
@@ -70,52 +70,52 @@
 	 */
 	do_action( 'commentsrss2_head' );
 
-	if ( have_comments() ) :
-		while ( have_comments() ) :
-			the_comment();
-			$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
-			?>
-			<item>
-				<title>
-				<?php
-				if ( ! is_singular() ) {
-					$title = get_the_title( $comment_post->ID );
-					/** This filter is documented in wp-includes/feed.php */
-					$title = apply_filters( 'the_title_rss', $title );
-					/* translators: Individual comment title. 1: Post title, 2: Comment author name */
-					printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
-				} else {
-					/* translators: Comment author title. %s: Comment author name */
-					printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
-				}
-				?>
-				</title>
-				<link><?php comment_link(); ?></link>
+	while ( have_comments() ) :
+		the_comment();
+		$comment_post    = get_post( $comment->comment_post_ID );
+		$GLOBALS['post'] = $comment_post;
+		?>
+	<item>
+		<title>
+		<?php
+		if ( ! is_singular() ) {
+			$title = get_the_title( $comment_post->ID );
+			/** This filter is documented in wp-includes/feed.php */
+			$title = apply_filters( 'the_title_rss', $title );
+			/* translators: Individual comment title. 1: Post title, 2: Comment author name. */
+			printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
+		} else {
+			/* translators: Comment author title. %s: Comment author name. */
+			printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
+		}
+		?>
+		</title>
+		<link><?php comment_link(); ?></link>
+
 		<dc:creator><![CDATA[<?php echo get_comment_author_rss(); ?>]]></dc:creator>
 		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></pubDate>
 		<guid isPermaLink="false"><?php comment_guid(); ?></guid>
-			<?php if ( post_password_required( $comment_post ) ) : ?>
-		<description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>
-		<content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>
-		<?php else : // post pass ?>
-		<description><![CDATA[<?php comment_text_rss(); ?>]]></description>
-		<content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>
-			<?php
-		endif; // post pass
-			/**
-			 * Fires at the end of each RSS2 comment feed item.
-			 *
-			 * @since 2.1.0
-			 *
-			 * @param int $comment->comment_ID The ID of the comment being displayed.
-			 * @param int $comment_post->ID    The ID of the post the comment is connected to.
-			 */
-			do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
+
+		<?php if ( post_password_required( $comment_post ) ) : ?>
+			<description><?php echo ent2ncr( __( 'Protected Comments: Please enter your password to view comments.' ) ); ?></description>
+			<content:encoded><![CDATA[<?php echo get_the_password_form(); ?>]]></content:encoded>
+		<?php else : ?>
+			<description><![CDATA[<?php comment_text_rss(); ?>]]></description>
+			<content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>
+		<?php endif; // End if post_password_required(). ?>
+
+		<?php
+		/**
+		 * Fires at the end of each RSS2 comment feed item.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param int $comment_ID The ID of the comment being displayed.
+		 * @param int $ID         The ID of the post the comment is connected to.
+		 */
+		do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
 		?>
-			</item>
-			<?php
-		endwhile;
-endif;
-	?>
+	</item>
+	<?php endwhile; ?>
 </channel>
 </rss>