From 72529b3debe1f6daa8357e7d4cfe288126117b2f Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 9 Aug 2019 01:30:32 +0000 Subject: [PATCH] Feeds: Introduce the `get_self_link()` function. Corresponds to the `self_link()` template function. This matches other feed template functions, using one function to get the value, and a different function to echo it. Props jojotjebaby, mobeen-abdullah, donmhico, audrasjb, dshanske. Fixes #44838. git-svn-id: https://develop.svn.wordpress.org/trunk@45772 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/feed.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/feed.php b/src/wp-includes/feed.php index 7b4046b22a..dafd3a2551 100644 --- a/src/wp-includes/feed.php +++ b/src/wp-includes/feed.php @@ -615,6 +615,18 @@ function rss2_site_icon() { } } +/** + * Returns the link for the currently displayed feed. + * + * @since 5.3.0 + * + * @return string Correct link for the atom:self element. + */ +function get_self_link() { + $host = @parse_url( home_url() ); + return set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ); +} + /** * Display the link for the currently displayed feed in a XSS safe way. * @@ -623,7 +635,6 @@ function rss2_site_icon() { * @since 2.5.0 */ function self_link() { - $host = @parse_url( home_url() ); /** * Filters the current feed URL. * @@ -634,7 +645,7 @@ function self_link() { * * @param string $feed_link The link for the feed with set URL scheme. */ - echo esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ); + echo esc_url( apply_filters( 'self_link', get_self_link() ) ); } /**