Changeset 24213 for trunk/wp-includes/default-widgets.php

Timestamp:

05/08/2013 11:23:05 PM (13 years ago)

Author:

SergeyBiryukov

Message:

Don't append ellipsis in RSS widget if the entire content is shown. props kovshenin. fixes #21702.

File:

• trunk/wp-includes/default-widgets.php (modified) (1 diff)

trunk/wp-includes/default-widgets.php

@@ -867 +867 @@
 
         $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) );
-        $desc = wp_html_excerpt( $desc, 360 );
+        $excerpt = wp_html_excerpt( $desc, 360 );
 
         // Append ellipsis. Change existing [...] to […].
-        if ( '[...]' == substr( $desc, -5 ) )
-            $desc = substr( $desc, 0, -5 ) . '[…]';
-        elseif ( '[…]' != substr( $desc, -10 ) )
-            $desc .= ' […]';
-
-        $desc = esc_html( $desc );
+        if ( '[...]' == substr( $excerpt, -5 ) )
+            $excerpt = substr( $excerpt, 0, -5 ) . '[…]';
+        elseif ( '[…]' != substr( $excerpt, -10 ) && $desc != $excerpt )
+            $excerpt .= ' […]';
+
+        $excerpt = esc_html( $excerpt );
 
         if ( $show_summary ) {
-            $summary = "<div class='rssSummary'>$desc</div>";
+            $summary = "<div class='rssSummary'>$excerpt</div>";
         } else {
             $summary = '';