Changeset 27691

Timestamp:

03/24/2014 09:07:10 PM (12 years ago)

Author:

nacin

Message:

RSS widgets: Omit the title attribute when the summary is shown.

Trim the title attribute to ensure whitespace isn't rendered.

props SergeyBiryukov.
fixes #26520. see #26552.

File:

• trunk/src/wp-includes/default-widgets.php (modified) (2 diffs)

trunk/src/wp-includes/default-widgets.php

@@ -867 +867 @@
                         $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 );
-
-                // 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 );
-
+                $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 ) );
+                $desc = wp_html_excerpt( $desc, 360 );
+
+                $summary = '';
                 if ( $show_summary ) {
-                        $summary = "<div class='rssSummary'>$excerpt</div>";
-                } else {
-                        $summary = '';
+                        $summary = $desc;
+
+                        // Append ellipsis. Change existing [...] to [&hellip;].
+                        if ( '[...]' == substr( $summary, -5 ) ) {
+                                $summary = substr( $summary, 0, -5 ) . '[&hellip;]';
+                        } elseif ( '[&hellip;]' != substr( $summary, -10 ) && $desc !== $summary ) {
+                                $summary .= ' [&hellip;]';
+                        }
+
+                        $summary = '<div class="rssSummary">' . esc_html( $summary ) . '</div>';
                 }
 
@@ -904 +906 @@
                 if ( $link == '' ) {
                         echo "<li>$title{$date}{$summary}{$author}</li>";
+                } elseif ( $show_summary ) {
+                        echo "<li><a class='rsswidget' href='$link'>$title</a>{$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='$desc'>$title</a>{$date}{$author}</li>";
                 }
         }