X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..3d39054f012aefe514b3f5509e32f09fc4feda44:/wp-includes/feed-atom.php

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index f75e7846..a4a62f74 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -5,52 +5,86 @@
  * @package WordPress
  */
 
-header('Content-Type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
+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', 'atom' );
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <feed
   xmlns="http://www.w3.org/2005/Atom"
   xmlns:thr="http://purl.org/syndication/thread/1.0"
-  xml:lang="<?php echo get_option('rss_language'); ?>"
-  xml:base="<?php bloginfo_rss('home') ?>/wp-atom.php"
-  <?php do_action('atom_ns'); ?>
+  xml:lang="<?php bloginfo_rss( 'language' ); ?>"
+  xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
+  <?php
+  /**
+   * Fires at end of the Atom feed root to add namespaces.
+   *
+   * @since 2.0.0
+   */
+  do_action( 'atom_ns' );
+  ?>
  >
-	<title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
+	<title type="text"><?php wp_title_rss(); ?></title>
 	<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 
-	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
-	<?php the_generator( 'atom' ); ?>
+	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
 
-	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
+	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url') ?>" />
 	<id><?php bloginfo('atom_url'); ?></id>
 	<link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
-	<?php do_action('atom_head'); ?>
-	<?php while (have_posts()) : the_post(); ?>
+	<?php
+	/**
+	 * Fires just before the first Atom feed entry.
+	 *
+	 * @since 2.0.0
+	 */
+	do_action( 'atom_head' );
+
+	while ( have_posts() ) : the_post();
+	?>
 	<entry>
 		<author>
 			<name><?php the_author() ?></name>
-			<?php $author_url = get_the_author_url(); if ( !empty($author_url) ) : ?>
-			<uri><?php the_author_url()?></uri>
-			<?php endif; ?>
+			<?php $author_url = get_the_author_meta('url'); if ( !empty($author_url) ) : ?>
+			<uri><?php the_author_meta('url')?></uri>
+			<?php endif;
+
+			/**
+			 * Fires at the end of each Atom feed author entry.
+			 *
+			 * @since 3.2.0
+			 */
+			do_action( 'atom_author' );
+		?>
 		</author>
 		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
-		<link rel="alternate" type="text/html" href="<?php the_permalink_rss() ?>" />
-		<id><?php the_guid(); ?></id>
+		<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>" />
+		<id><?php the_guid() ; ?></id>
 		<updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
 		<published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
 		<?php the_category_rss('atom') ?>
 		<summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
-		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
+		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content_feed('atom') ?>]]></content>
 <?php endif; ?>
-<?php atom_enclosure(); ?>
-<?php do_action('atom_entry'); ?>
-		<link rel="replies" type="text/html" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
-		<link rel="replies" type="application/atom+xml" href="<?php echo get_post_comments_feed_link(0,'atom') ?>" thr:count="<?php echo get_comments_number()?>"/>
+	<?php atom_enclosure();
+	/**
+	 * Fires at the end of each Atom feed item.
+	 *
+	 * @since 2.0.0
+	 */
+	do_action( 'atom_entry' );
+
+	if ( get_comments_number() || comments_open() ) :
+		?>
+		<link rel="replies" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
+		<link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link(0, 'atom') ); ?>" thr:count="<?php echo get_comments_number()?>"/>
 		<thr:total><?php echo get_comments_number()?></thr:total>
+	<?php endif; ?>
 	</entry>
 	<?php endwhile ; ?>
 </feed>