Ticket #11244: 11244.4.diff

default-widgets.php

@@ -805 +805 @@
                 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')))));
-                $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 if there isn't one at the end already.
+                // Change an existing [...] at the end of an excerpt to […].
+                if ( !preg_match( '/(\[…\]|\[...\])$/D', $desc ) )
+                        $desc .= ' […]';
+                else
+                        $desc = preg_replace( '/\[...\]$/D', ' […]', $desc );
+
                 $desc = esc_html( $desc );
 
                 if ( $show_summary ) {