diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/feed-rss2-comments.php
--- a/wp/wp-includes/feed-rss2-comments.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/feed-rss2-comments.php	Mon Oct 14 18:28:13 2019 +0200
@@ -5,9 +5,9 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type( 'rss2' ) . '; charset=' . get_option( 'blog_charset' ), true );
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
 do_action( 'rss_tag_pre', 'rss2-comments' );
@@ -32,33 +32,36 @@
 	?>
 >
 <channel>
-	<title><?php
-		if ( is_singular() ) {
-			/* translators: Comments feed title. 1: Post title */
-			printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
-		} elseif ( is_search() ) {
-			/* translators: Comments feed title. 1: Site name, 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. 1: Site name */
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
-		}
-	?></title>
+	<title>
+	<?php
+	if ( is_singular() ) {
+		/* 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 */
+		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 */
+		printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
+	}
+	?>
+	</title>
 	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-	<link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
-	<description><?php bloginfo_rss("description") ?></description>
-	<lastBuildDate><?php
-		$date = get_lastcommentmodified( 'GMT' );
-		echo $date ? mysql2date( 'r', $date, false ) : date( 'r' );
-	?></lastBuildDate>
-	<sy:updatePeriod><?php
+	<link><?php ( is_single() ) ? the_permalink_rss() : bloginfo_rss( 'url' ); ?></link>
+	<description><?php bloginfo_rss( 'description' ); ?></description>
+	<lastBuildDate><?php echo get_feed_build_date( 'r' ); ?></lastBuildDate>
+	<sy:updatePeriod>
+	<?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
 		echo apply_filters( 'rss_update_period', 'hourly' );
-	?></sy:updatePeriod>
-	<sy:updateFrequency><?php
+	?>
+	</sy:updatePeriod>
+	<sy:updateFrequency>
+	<?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
 		echo apply_filters( 'rss_update_frequency', '1' );
-	?></sy:updateFrequency>
+	?>
+	</sy:updateFrequency>
 	<?php
 	/**
 	 * Fires at the end of the RSS2 comment feed header.
@@ -67,44 +70,52 @@
 	 */
 	do_action( 'commentsrss2_head' );
 
-	if ( have_comments() ) : while ( have_comments() ) : the_comment();
-		$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
+	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>
+		<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 );
+		?>
+			</item>
+			<?php
+		endwhile;
+endif;
 	?>
-	<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. 1: 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 );
-?>
-	</item>
-<?php endwhile; endif; ?>
 </channel>
 </rss>