Ticket #34083: 34083.2.patch

src/wp-includes/feed-rss2-comments.php

@@ -41 +41 @@
                         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>
+        <link><?php source_link_rss(); ?></link>
         <description><?php bloginfo_rss("description") ?></description>
         <lastBuildDate><?php echo mysql2date('r', get_lastcommentmodified('GMT')); ?></lastBuildDate>
         <sy:updatePeriod><?php

src/wp-includes/feed-rss2.php

@@ -40 +40 @@
 <channel>
         <title><?php wp_title_rss(); ?></title>
         <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-        <link><?php bloginfo_rss('url') ?></link>
+        <link><?php source_link_rss(); ?></link>
         <description><?php bloginfo_rss("description") ?></description>
         <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
         <language><?php bloginfo_rss( 'language' ); ?></language>

src/wp-includes/feed.php

@@ -619 +619 @@
 }
 
 /**
+ * Display the orignal source link for the currently displayed feed.
+ *
+ * Generate a correct link for the <link> element.
+ *
+ * @since 4.4.0
+ */
+function source_link_rss() {
+        global $wp_query;
+        $queried_object = get_queried_object();
+
+        // Posts and Custom Post Types
+        if( $wp_query->is_singular() ) {
+                $source_link = the_permalink_rss();
+        }
+        // Pages
+        else if( $wp_query->is_page() && isset( $wp_query->query['pagename'] ) ) {
+                $page = get_page_by_path( $wp_query->query['pagename'] );
+                $source_link = get_page_link( $page->ID );
+        }
+        // Taxonomy Archive Pages
+        else if( ( $wp_query->is_category() || $wp_query->is_tag() || $wp_query->is_taxonomy() ) && isset( $queried_object->term_id ) && ! empty( $queried_object->term_id ) ) {
+                $source_link = get_term_link( $queried_object->term_id );
+        }
+        // Date Archive Pages
+        else if( $wp_query->is_date() ) {
+                if( $wp_query->is_day() ) {
+                        $source_link = get_day_link( $wp_query->query_vars['year'], $wp_query->query_vars['monthnum'], $wp_query->query_vars['day'] );
+                } else if( $wp_query->is_month() ) {
+                        $source_link = get_month_link( $wp_query->query['year'], $wp_query->query['monthnum'] );
+                }
+        }
+        // Custom Post Type Archive Pages
+        else if( $wp_query->is_post_type_archive() && isset( $wp_query->query['post_type'] ) && ! empty( $wp_query->query['post_type'] ) ) {
+                $post_type = $wp_query->query['post_type'];
+                $source_link = get_post_type_archive_link( $post_type );
+        }
+        // Search Result Pages
+        else if( $wp_query->is_search() && isset( $wp_query->query['s'] ) && ! empty( $wp_query->query['s'] ) ) {
+                $source_link = get_search_link( $wp_query->query['s'] );
+        }
+        // Fallback
+        else {
+                $source_link = bloginfo_rss('url');
+        }
+
+        /**
+         * Filter the original HTML source link URL for use in RSS feeds.
+         *
+         * @since 4.4.0
+         *
+         *
+         * @param string $source_link The link to the orignal HTML source the feed represents.
+         */
+        echo esc_url( apply_filters( 'source_link_rss', $source_link ) );
+}
+
+/**
  * Return the content type for specified feed type.
  *
  * @since 2.8.0