Mercurial Mercurial > enmi-conf.org / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wp/wp-includes/feed-atom-comments.php
changeset 16 a86126ab1dd4
parent 9 177826044cd9
child 21 48c4eec2b7e6 
--- a/wp/wp-includes/feed-atom-comments.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/feed-atom-comments.php	Tue Dec 15 13:49:49 2020 +0100
@@ -30,13 +30,13 @@
 	<title type="text">
 	<?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() );
 	}
 	?>
@@ -45,19 +45,19 @@
 
 	<updated><?php echo get_feed_build_date( 'Y-m-d\TH:i:s\Z' ); ?></updated>
 
-<?php if ( is_singular() ) { ?>
+<?php if ( is_singular() ) : ?>
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php comments_link_feed(); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?>" />
 	<id><?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?></id>
-<?php } elseif ( is_search() ) { ?>
+<?php elseif ( is_search() ) : ?>
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link( '', 'atom' ); ?>" />
 	<id><?php echo get_search_comments_feed_link( '', 'atom' ); ?></id>
-<?php } else { ?>
+<?php else : ?>
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php bloginfo_rss( 'comments_atom_url' ); ?>" />
 	<id><?php bloginfo_rss( 'comments_atom_url' ); ?></id>
-<?php } ?>
+<?php endif; ?>
 <?php
 	/**
 	 * Fires at the end of the Atom comment feed header.
@@ -67,11 +67,11 @@
 	do_action( 'comments_atom_head' );
 ?>
 <?php
-if ( have_comments() ) :
-	while ( have_comments() ) :
-		the_comment();
-		$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
-		?>
+while ( have_comments() ) :
+	the_comment();
+	$comment_post    = get_post( $comment->comment_post_ID );
+	$GLOBALS['post'] = $comment_post;
+	?>
 	<entry>
 		<title>
 		<?php
@@ -79,15 +79,15 @@
 			$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 */
+			/* 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 */
+			/* translators: Comment author title. %s: Comment author name. */
 			printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
 		}
 		?>
-			</title>
-			<link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
+		</title>
+		<link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
 
 		<author>
 			<name><?php comment_author_rss(); ?></name>
@@ -101,37 +101,43 @@
 		<id><?php comment_guid(); ?></id>
 		<updated><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></updated>
 		<published><?php echo mysql2date( 'Y-m-d\TH:i:s\Z', get_comment_time( 'Y-m-d H:i:s', true, false ), false ); ?></published>
+
 		<?php if ( post_password_required( $comment_post ) ) : ?>
-		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
-	<?php else : // post pass ?>
-		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
+			<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
+		<?php else : ?>
+			<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
+		<?php endif; // End if post_password_required(). ?>
+
 		<?php
-	endif; // post pass
-	// Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt)
-	if ( $comment->comment_parent == 0 ) : // This comment is top level
-		?>
-	<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
-		<?php
-	else : // This comment is in reply to another comment
-		$parent_comment = get_comment( $comment->comment_parent );
-		// The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system
+		// Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt).
+		if ( 0 == $comment->comment_parent ) : // This comment is top-level.
+			?>
+			<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
+			<?php
+		else : // This comment is in reply to another comment.
+			$parent_comment = get_comment( $comment->comment_parent );
+			/*
+			 * The rel attribute below and the id tag above should be GUIDs,
+			 * but WP doesn't create them for comments (unlike posts).
+			 * Either way, it's more important that they both use the same system.
+			 */
+			?>
+			<thr:in-reply-to ref="<?php comment_guid( $parent_comment ); ?>" href="<?php echo get_comment_link( $parent_comment ); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
+			<?php
+		endif;
+
+		/**
+		 * Fires at the end of each Atom comment feed item.
+		 *
+		 * @since 2.2.0
+		 *
+		 * @param int $comment_id      ID of the current comment.
+		 * @param int $comment_post_id ID of the post the current comment is connected to.
+		 */
+		do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );
 		?>
-		<thr:in-reply-to ref="<?php comment_guid( $parent_comment ); ?>" href="<?php echo get_comment_link( $parent_comment ); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
-		<?php
-endif;
-	/**
-	 * Fires at the end of each Atom comment feed item.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param int $comment_id      ID of the current comment.
-	 * @param int $comment_post_id ID of the post the current comment is connected to.
-	 */
-	do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );
-	?>
 	</entry>
-		<?php
-	endwhile;
-endif;
+	<?php
+endwhile;
 ?>
 </feed>
enmi-conf.org