Ticket #34083: 34083.3.diff

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

@@ -45 +45 @@
                 }
         ?></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
                 $date = get_lastcommentmodified( 'GMT' );

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
                 $date = get_lastpostmodified( 'GMT' );

src/wp-includes/feed.php

@@ -626 +626 @@
 }
 
 /**
+ * Display the orignal source link for the currently displayed feed.
+ *
+ * Generate a correct link for the <link> element.
+ *
+ * @since 4.8.0
+ */
+function source_link_rss() {
+        // Posts, Pages and Custom Post Types
+        if ( is_singular() ) {
+                $source_link = the_permalink_rss();
+        }
+        // Taxonomy Archive Pages
+        elseif ( ( is_category() || is_tag() || is_tax() ) && get_queried_object_id() ) {
+                $source_link = get_term_link( get_queried_object_id() );
+        }
+        // Date Archive Pages
+        elseif ( is_date() ) {
+                if ( is_day() ) {
+                        $source_link = get_day_link( get_query_var( 'year' ), get_query_var( 'monthnum' ), get_query_var( 'day' ) );
+                } elseif ( is_month() ) {
+                        $source_link = get_month_link( get_query_var( 'year' ), get_query_var( 'monthnum' ) );
+                }
+        }
+        // Custom Post Type Archive Pages
+        elseif ( is_post_type_archive() && get_query_var( 'post_type' ) ) {
+                $source_link = get_post_type_archive_link( get_query_var( 'post_type' ) );
+        }
+        // Search Result Pages
+        elseif ( is_search() && get_query_var( 's' ) ) {
+                $source_link = get_search_link( get_query_var( 's' ) );
+        }
+        // Fallback
+        else {
+                $source_link = bloginfo_rss( 'url' );
+        }
+
+        /**
+         * Filter the original HTML source link URL for use in RSS feeds.
+         *
+         * @since 4.8.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