WordPress 4.6.3-scripts

[autoinstalls/wordpress.git] / wp-includes / feed-atom-comments.php

diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php
index 1a89c47955bb91f4e04b94708eacd7a9bc326714..e5c70891640a039435de1af44a3f55370d5742a2 100644 (file)
--- a/wp-includes/feed-atom-comments.php
+++ b/wp-includes/feed-atom-comments.php
@@ -7,12 +7,25 @@
 
 header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>';
 
 header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 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-comments' );

 ?>
 <feed
        xmlns="http://www.w3.org/2005/Atom"
        xml:lang="<?php bloginfo_rss( 'language' ); ?>"
        xmlns:thr="http://purl.org/syndication/thread/1.0"
 ?>
 <feed
        xmlns="http://www.w3.org/2005/Atom"
        xml:lang="<?php bloginfo_rss( 'language' ); ?>"
        xmlns:thr="http://purl.org/syndication/thread/1.0"

-       <?php do_action('atom_ns'); do_action('atom_comments_ns'); ?>
+       <?php
+               /** This action is documented in wp-includes/feed-atom.php */
+               do_action( 'atom_ns' );
+
+               /**
+                * Fires inside the feed tag in the Atom comment feed.
+                *
+                * @since 2.8.0
+                */
+               do_action( 'atom_comments_ns' );
+       ?>

 >
        <title type="text"><?php
                if ( is_singular() )
 >
        <title type="text"><?php
                if ( is_singular() )


@@ -20,7 +33,7 @@ echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>'
                elseif ( is_search() )
                        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
                else
                elseif ( is_search() )
                        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
                else

-                       printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
+                       printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );

        ?></title>
        <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
 
        ?></title>
        <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
 


@@ -30,7 +43,7 @@ echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>'
        <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>
        <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>
        <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>


@@ -39,7 +52,14 @@ echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>'
        <link rel="self" type="application/atom+xml" href="<?php bloginfo_rss('comments_atom_url'); ?>" />
        <id><?php bloginfo_rss('comments_atom_url'); ?></id>
 <?php } ?>
        <link rel="self" type="application/atom+xml" href="<?php bloginfo_rss('comments_atom_url'); ?>" />
        <id><?php bloginfo_rss('comments_atom_url'); ?></id>
 <?php } ?>

-<?php do_action('comments_atom_head'); ?>
+<?php
+       /**
+        * Fires at the end of the Atom comment feed header.
+        *
+        * @since 2.8.0
+        */
+       do_action( 'comments_atom_head' );
+?>

 <?php
 if ( have_comments() ) : while ( have_comments() ) : the_comment();
        $comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
 <?php
 if ( have_comments() ) : while ( have_comments() ) : the_comment();
        $comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );


@@ -48,7 +68,8 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
                <title><?php
                        if ( !is_singular() ) {
                                $title = get_the_title($comment_post->ID);
                <title><?php
                        if ( !is_singular() ) {
                                $title = get_the_title($comment_post->ID);

-                               $title = apply_filters('the_title_rss', $title);
+                               /** This filter is documented in wp-includes/feed.php */
+                               $title = apply_filters( 'the_title_rss', $title );

                                printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
                        } else {
                                printf(ent2ncr(__('By: %s')), get_comment_author_rss());
                                printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
                        } else {
                                printf(ent2ncr(__('By: %s')), get_comment_author_rss());


@@ -70,7 +91,7 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
 <?php else : // post pass ?>
                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
 <?php endif; // post pass
 <?php else : // post pass ?>
                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
 <?php endif; // post pass

-       // Return comment threading information (http://www.ietf.org/rfc/rfc4685.txt)
+       // 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
        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


@@ -79,7 +100,15 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
 ?>
                <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;
 ?>
                <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;

-       do_action('comment_atom_entry', $comment->comment_ID, $comment_post->ID);
+       /**
+        * 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; ?>
 ?>
        </entry>
 <?php endwhile; endif; ?>