From fffde30995b63d1cec801d19f4c57c26bd19576b Mon Sep 17 00:00:00 2001
From: joedolson <joedolson@git.wordpress.org>
Date: Sun, 7 Nov 2021 23:04:56 +0000
Subject: [PATCH] Widgets: Add filter to disable RSS widget icon.

Add a filter that disables output of the icon on RSS feed widgets. Improves accessibility by providing a path to prevent duplicate or invisible links.

Props sabernhardt, Boniu91.
Fixes #52224.
Built from https://develop.svn.wordpress.org/trunk@52031


git-svn-id: http://core.svn.wordpress.org/trunk@51623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyseventeen/rtl.css    |  4 +++
 wp-content/themes/twentyseventeen/style.css  |  2 +-
 wp-content/themes/twentytwenty/style-rtl.css |  2 +-
 wp-content/themes/twentytwenty/style.css     |  2 +-
 wp-includes/version.php                      |  2 +-
 wp-includes/widgets/class-wp-widget-rss.php  | 27 +++++++++++++++++---
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/rtl.css b/wp-content/themes/twentyseventeen/rtl.css
index 1c5e4c7adf..f91e2a6ded 100644
--- a/wp-content/themes/twentyseventeen/rtl.css
+++ b/wp-content/themes/twentyseventeen/rtl.css
@@ -229,6 +229,10 @@ input[type="checkbox"] {
 	margin: 0;
 }
 
+.widget_rss .widget-title .rsswidget:first-child:not(.rss-widget-title) {
+	float: left;
+}
+
 .search-form .search-submit {
 	left: 3px;
 	right: auto;
diff --git a/wp-content/themes/twentyseventeen/style.css b/wp-content/themes/twentyseventeen/style.css
index b3621b79e3..be1c214696 100644
--- a/wp-content/themes/twentyseventeen/style.css
+++ b/wp-content/themes/twentyseventeen/style.css
@@ -2662,7 +2662,7 @@ h2.widget-title {
 
 /* RSS Widget */
 
-.widget_rss .widget-title .rsswidget:first-child {
+.widget_rss .widget-title .rsswidget:first-child:not(.rss-widget-title) {
 	float: right;
 }
 
diff --git a/wp-content/themes/twentytwenty/style-rtl.css b/wp-content/themes/twentytwenty/style-rtl.css
index d412545acc..aa87bedf03 100644
--- a/wp-content/themes/twentytwenty/style-rtl.css
+++ b/wp-content/themes/twentytwenty/style-rtl.css
@@ -4286,7 +4286,7 @@ div.comment:first-of-type {
 
 /* Widget: RSS ------------------------------- */
 
-.widget_rss .widget-title a.rsswidget:first-of-type {
+.widget_rss .widget-title a.rsswidget:first-of-type:not(.rss-widget-title) {
 	display: none;
 }
 
diff --git a/wp-content/themes/twentytwenty/style.css b/wp-content/themes/twentytwenty/style.css
index 80417f5b83..b5a99f90f5 100644
--- a/wp-content/themes/twentytwenty/style.css
+++ b/wp-content/themes/twentytwenty/style.css
@@ -4320,7 +4320,7 @@ div.comment:first-of-type {
 
 /* Widget: RSS ------------------------------- */
 
-.widget_rss .widget-title a.rsswidget:first-of-type {
+.widget_rss .widget-title a.rsswidget:first-of-type:not(.rss-widget-title) {
 	display: none;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 91f5e85a1c..990bc379ec 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52030';
+$wp_version = '5.9-alpha-52031';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets/class-wp-widget-rss.php b/wp-includes/widgets/class-wp-widget-rss.php
index 6c72a2cd15..a265680901 100644
--- a/wp-includes/widgets/class-wp-widget-rss.php
+++ b/wp-includes/widgets/class-wp-widget-rss.php
@@ -86,10 +86,31 @@ class WP_Widget_RSS extends WP_Widget {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
-		$url  = strip_tags( $url );
-		$icon = includes_url( 'images/rss.png' );
 		if ( $title ) {
-			$title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">' . esc_html( $title ) . '</a>';
+			$feed_link = '';
+			$feed_url  = strip_tags( $url );
+			$feed_icon = includes_url( 'images/rss.png' );
+			$feed_link = sprintf(
+				'<a class="rsswidget rss-widget-feed" href="%1$s"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="%2$s" alt="%3$s"%4$s /></a> ',
+				esc_url( $feed_url ),
+				esc_url( $feed_icon ),
+				esc_attr__( 'RSS' ),
+				( wp_lazy_loading_enabled( 'img', 'rss_widget_feed_icon' ) ? ' loading="lazy"' : '' )
+			);
+
+			/**
+			 * Filters the classic RSS widget's feed icon link.
+			 *
+			 * Themes can remove the icon link by using `add_filter( 'rss_widget_feed_link', '__return_false' );`.
+			 *
+			 * @since 5.9.0
+			 *
+			 * @param string $feed_link HTML for link to RSS feed.
+			 * @param array  $instance  Array of settings for the current widget.
+			 */
+			$feed_link = apply_filters( 'rss_widget_feed_link', $feed_link, $instance );
+
+			$title = $feed_link . '<a class="rsswidget rss-widget-title" href="' . esc_url( $link ) . '">' . esc_html( $title ) . '</a>';
 		}
 
 		echo $args['before_widget'];