Ticket #11446: 11446.4.patch

wp-admin/edit-comments.php

@@ -105 +105 @@
 enqueue_comment_hotkeys_js();
 
 if ( $post_id )
-        $title = sprintf(__('Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50));
+        $title = sprintf(__('Comments on “%s”'),
+                                         wp_html_excerpt( _draft_or_post_title($post_id), 50,
+                                                                          array( 'append_ellipsis' => true ) ) );
 else
         $title = __('Comments');
 
@@ -146 +148 @@
         echo sprintf(__('Comments on “%s”'),
                 sprintf('<a href="%s">%s</a>',
                         get_edit_post_link($post_id),
-                        wp_html_excerpt(_draft_or_post_title($post_id), 50)
+                        wp_html_excerpt( _draft_or_post_title($post_id), 50,
+                                                         array( 'append_ellipsis' => true ) )
                 )
         );
 else
         echo __('Comments');
 
 if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
-        printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50 ) ) . '</span>' ); ?>
+        printf( '<span class="subtitle">' .
+                        sprintf( __( 'Search results for &#8220;%s&#8221;' ),
+                                         wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50,
+                                                                          array( 'append_ellipsis' => true ) ) ) .
+                        '</span>' ); ?>
 </h2>
 
 <?php

wp-admin/includes/dashboard.php

@@ -827 +827 @@
                         $publisher = "<strong>$publisher</strong>";
 
                 $content = $item->get_content();
-                $content = wp_html_excerpt($content, 50) . ' &hellip;';
+                $content = wp_html_excerpt( $content, 50, array( 'append_ellipsis' => true ) );
 
                 if ( $link )
                         /* translators: incoming links feed, %1$s is other person, %3$s is content */

wp-admin/includes/media.php

@@ -1159 +1159 @@
         }
 
         $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-        $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60 ) . "</span></div>" : '';
+        $display_title = "<div class='filename new'><span class='title'>" .
+                                         wp_html_excerpt( $display_title, 60,
+                                                                          array( 'append_ellipsis' => true ) ) .
+                                         "</span></div>";
+        if ( ! $show_title ) {
+                $display_title = '';
+        }
 
         $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
         $order = '';

wp-admin/includes/nav-menu.php

@@ -516 +516 @@
                                         <?php foreach ( $menus as $menu ) : ?>
                                         <option<?php selected( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $menu->term_id ); ?>
                                                 value="<?php echo $menu->term_id; ?>"><?php
-                                                $truncated_name = wp_html_excerpt( $menu->name, 40 );
-                                                echo $truncated_name == $menu->name ? $menu->name : trim( $truncated_name ) . '&hellip;';
+                                                echo wp_html_excerpt( $menu->name, 40, array( 'append_ellipsis' => true ) );
                                         ?></option>
                                         <?php endforeach; ?>
                                 </select>

wp-admin/nav-menus.php

@@ -436 +436 @@
 
 // Generate truncated menu names
 foreach( (array) $nav_menus as $key => $_nav_menu ) {
-        $_nav_menu->truncated_name = trim( wp_html_excerpt( $_nav_menu->name, 40 ) );
-        if ( $_nav_menu->truncated_name != $_nav_menu->name )
-                $_nav_menu->truncated_name .= '…';
-
+        $_nav_menu->truncated_name = trim( wp_html_excerpt( $_nav_menu->name, 40, array( 'append_ellipsis' => true ) ) );
         $nav_menus[$key]->truncated_name = $_nav_menu->truncated_name;
 }
 

wp-includes/comment.php

@@ -1753 +1753 @@
         else
                 $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
         $excerpt = str_replace(']]>', ']]>', $excerpt);
-        $excerpt = wp_html_excerpt($excerpt, 252) . '…';
+        $excerpt = wp_html_excerpt( $excerpt, 252, array( 'append_ellipsis' => true ) );
 
         $post_title = apply_filters('the_title', $post->post_title, $post->ID);
         $post_title = strip_tags($post_title);

wp-includes/formatting.php

@@ -3114 +3114 @@
  * be counted as one character. For example & will be counted as 4, < as
  * 3, etc.
  *
+ * The list of arguments that $options can contain, which will overwrite the
+ * defaults:
+ *
+ * append_ellipsis - Whether to append truncated string with an ellipsis.
+ * Defaults to false.
+ *
  * @since 2.5.0
  *
  * @param integer $str String to get the excerpt from.
  * @param integer $count Maximum number of characters to take.
+ * @param string|array $options Additional options affecting extracted output.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count ) {
+function wp_html_excerpt( $str, $count, $options = '' ) {
+        $defaults = array(
+                'append_ellipsis' => false
+        );
+        $options = wp_parse_args( $options, $defaults );
         $str = wp_strip_all_tags( $str, true );
-        $str = mb_substr( $str, 0, $count );
+        $new_str = mb_substr( $str, 0, $count );
         // remove part of an entity at the end
-        $str = preg_replace( '/&[^;\s]{0,6}$/', '', $str );
-        return $str;
+        $new_str = preg_replace( '/&[^;\s]{0,6}$/', '', $new_str );
+        if( $options['append_ellipsis'] && strlen( $new_str ) < strlen( $str ) )
+                $new_str .= '&hellip;';
+        return $new_str;
 }
 
 /**
@@ -3385 +3398 @@
  */
 function wp_unslash( $value ) {
         return stripslashes_deep( $value );
-}
- No newline at end of file
+}

wp-trackback.php

@@ -87 +87 @@
         if ( !pings_open($tb_id) )
                 trackback_response(1, 'Sorry, trackbacks are closed for this item.');
 
-        $title =  wp_html_excerpt( $title, 250 ) . '…';
-        $excerpt = wp_html_excerpt( $excerpt, 252 ) . '…';
+        $title =  wp_html_excerpt( $title, 250, array( 'append_ellipsis' => true ) );
+        $excerpt = wp_html_excerpt( $excerpt, 252, array( 'append_ellipsis' => true ) );
 
         $comment_post_ID = (int) $tb_id;
         $comment_author = $blog_name;