Ticket #26520: 26520.2.patch

src/wp-includes/default-widgets.php

@@ -866 +866 @@
                 if ( empty($title) )
                         $title = __('Untitled');
 
-                $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
-                $excerpt = wp_html_excerpt( $desc, 360 );
+                $summary = '';
+                if ( $show_summary ) {
+                        $desc = @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) );
+                        $desc = esc_attr( strip_tags( $desc ) );
+                        $desc = trim( str_replace( array( "\n", "\r" ), ' ', $desc ) );
+                        $excerpt = wp_html_excerpt( $desc, 360 );
 
-                // Append ellipsis. Change existing [...] to […].
-                if ( '[...]' == substr( $excerpt, -5 ) )
-                        $excerpt = substr( $excerpt, 0, -5 ) . '[…]';
-                elseif ( '[…]' != substr( $excerpt, -10 ) && $desc != $excerpt )
-                        $excerpt .= ' […]';
+                        // Append ellipsis. Change existing [...] to […].
+                        if ( '[...]' == substr( $excerpt, -5 ) ) {
+                                $excerpt = substr( $excerpt, 0, -5 ) . '[…]';
+                        } elseif ( '[…]' != substr( $excerpt, -10 ) && $desc != $excerpt ) {
+                                $excerpt .= ' […]';
+                        }
 
-                $excerpt = esc_html( $excerpt );
+                        $excerpt = esc_html( $excerpt );
 
-                if ( $show_summary ) {
                         $summary = "<div class='rssSummary'>$excerpt</div>";
-                } else {
-                        $summary = '';
                 }
 
                 $date = '';
@@ -904 +906 @@
                 if ( $link == '' ) {
                         echo "<li>$title{$date}{$summary}{$author}</li>";
                 } else {
-                        echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>{$date}{$summary}{$author}</li>";
+                        echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>";
                 }
         }
         echo '</ul>';