Changeset 13328

Timestamp:

02/23/2010 10:30:21 AM (15 years ago)

Author:

nacin

Message:

Don't show two ellipses in wp_widget_rss_output(). Fixes #11244 props miqrogroove

File:

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

trunk/wp-includes/default-widgets.php

@@ -806 +806 @@
             $title = __('Untitled');
 
-        $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 ) . ' […]';
+        $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 );
+
+        // Append ellipsis. Change existing [...] to […].
+        if ( '[...]' == substr( $desc, -5 ) )
+            $desc = substr( $desc, 0, -5 ) . '[…]';
+        elseif ( '[…]' != substr( $desc, -10 ) )
+            $desc .= ' […]';
+
         $desc = esc_html( $desc );