Ticket #52224: 52224.4-filter.diff

src/wp-content/themes/twentyseventeen/rtl.css

@@ -229 +229 @@
         margin: 0;
 }
 
+.widget_rss .widget-title .rsswidget:first-child:not(.rss-widget-title) {
+        float: left;
+}
+
 .search-form .search-submit {
         left: 3px;
         right: auto;

src/wp-content/themes/twentyseventeen/style.css

@@ -2662 +2662 @@
 
 /* RSS Widget */
 
-.widget_rss .widget-title .rsswidget:first-child {
+.widget_rss .widget-title .rsswidget:first-child:not(.rss-widget-title) {
         float: right;
 }
 

src/wp-content/themes/twentytwenty/style-rtl.css

@@ -4286 +4286 @@
 
 /* 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;
 }
 

src/wp-content/themes/twentytwenty/style.css

@@ -4320 +4320 @@
 
 /* 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;
 }
 

src/wp-includes/widgets/class-wp-widget-rss.php

@@ -86 +86 @@
                 /** 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'];

tests/phpunit/tests/rest-api/rest-widgets-controller.php

@@ -319 +319 @@
                                         'id'       => 'rss-1',
                                         'id_base'  => 'rss',
                                         'sidebar'  => 'sidebar-1',
-                                        'rendered' => '<a class="rsswidget" href="https://wordpress.org/news/feed"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="http://example.org/wp-includes/images/rss.png" alt="RSS" /></a> <a class="rsswidget" href="https://wordpress.org/news">RSS test</a><ul><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/introducing-learn-wordpress/\'>Introducing Learn WordPress</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/simone/\'>WordPress 5.6 “Simone”</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/state-of-the-word-2020/\'>State of the Word 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/the-month-in-wordpress-november-2020/\'>The Month in WordPress: November 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/wordpress-5-6-release-candidate-2/\'>WordPress 5.6 Release Candidate 2</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-release-candidate/\'>WordPress 5.6 Release Candidate</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-beta-4/\'>WordPress 5.6 Beta 4</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-beta-3/\'>WordPress 5.6 Beta 3</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/the-month-in-wordpress-october-2020/\'>The Month in WordPress: October 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/10/wordpress-5-5-3-maintenance-release/\'>WordPress 5.5.3 Maintenance Release</a></li></ul>',
+                                        'rendered' => '<a class="rsswidget rss-widget-feed" href="https://wordpress.org/news/feed"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="http://example.org/wp-includes/images/rss.png" alt="RSS" loading="lazy" /></a> <a class="rsswidget rss-widget-title" href="https://wordpress.org/news">RSS test</a><ul><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/introducing-learn-wordpress/\'>Introducing Learn WordPress</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/simone/\'>WordPress 5.6 “Simone”</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/state-of-the-word-2020/\'>State of the Word 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/the-month-in-wordpress-november-2020/\'>The Month in WordPress: November 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/12/wordpress-5-6-release-candidate-2/\'>WordPress 5.6 Release Candidate 2</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-release-candidate/\'>WordPress 5.6 Release Candidate</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-beta-4/\'>WordPress 5.6 Beta 4</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/wordpress-5-6-beta-3/\'>WordPress 5.6 Beta 3</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/11/the-month-in-wordpress-october-2020/\'>The Month in WordPress: October 2020</a></li><li><a class=\'rsswidget\' href=\'https://wordpress.org/news/2020/10/wordpress-5-5-3-maintenance-release/\'>WordPress 5.5.3 Maintenance Release</a></li></ul>',
                                         'instance' => array(
                                                 'encoded' => base64_encode(
                                                         serialize(

tests/phpunit/tests/widgets/wpWidgetRss.php

@@ -94 +94 @@
                 return array(
                         'when url is given' => array(
                                 'url' => 'https://wordpress.org/news/feed/',
-                                '<section id="widget_rss-5" class="widget widget_rss"><h2><a class="rsswidget" href="https://wordpress.org/news/feed/">',
+                                '<section id="widget_rss-5" class="widget widget_rss"><h2><a class="rsswidget rss-widget-feed" href="https://wordpress.org/news/feed/">',
                         ),
                 );
         }