Ticket #11446: 11446.5.patch

wp-admin/async-upload.php

@@ -57 +57 @@
                                 echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
                         echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
                         $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e
-                        echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60 ) ) . '</span></div>';
+                        echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
                         break;
                 case 2 :
                         add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);

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, '…' ) );
 else
         $title = __('Comments');
 
@@ -143 +143 @@
 <?php screen_icon(); ?>
 <h2><?php
 if ( $post_id )
-        echo sprintf(__('Comments on &#8220;%s&#8221;'),
-                sprintf('<a href="%s">%s</a>',
-                        get_edit_post_link($post_id),
-                        wp_html_excerpt(_draft_or_post_title($post_id), 50)
+        echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
+                sprintf( '<a href="%s">%s</a>',
+                        get_edit_post_link( $post_id ),
+                        wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
                 )
         );
 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, '&hellip;' ) ) . '</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, ' &hellip;' );
 
                 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 = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . "</span></div>" : '';
 
         $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
         $order = '';

wp-admin/includes/nav-menu.php

@@ -515 +515 @@
                                         <option value="0"></option>
                                         <?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;';
-                                        ?></option>
+                                                value="<?php echo $menu->term_id; ?>"><?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?></option>
                                         <?php endforeach; ?>
                                 </select>
                         </label>

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_menus[$key]->truncated_name = $_nav_menu->truncated_name;
+        $nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
 }
 
 // Retrieve menu locations
@@ -572 +568 @@
                                                                 <?php foreach ( $nav_menus as $menu ) : ?>
                                                                         <?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
                                                                         <option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> 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;'; ?>
+                                                                                <?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
                                                                         </option>
                                                                 <?php endforeach; ?>
                                                         </select>

wp-includes/admin-bar.php

@@ -229 +229 @@
                 $blogname = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) );
         }
 
-        $title = wp_html_excerpt( $blogname, 40 );
-        if ( $title != $blogname )
-                $title = trim( $title ) . '…';
+        $title = wp_html_excerpt( $blogname, 40, '…' );
 
         $wp_admin_bar->add_menu( array(
                 'id'    => 'site-name',

wp-includes/class-wp-customize-manager.php

@@ -897 +897 @@
                 if ( $menus ) {
                         $choices = array( 0 => __( '— Select —' ) );
                         foreach ( $menus as $menu ) {
-                                $truncated_name = wp_html_excerpt( $menu->name, 40 );
-                                $truncated_name = ( $truncated_name == $menu->name ) ? $menu->name : trim( $truncated_name ) . '…';
-                                $choices[ $menu->term_id ] = $truncated_name;
+                                $choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '…' );
                         }
 
                         foreach ( $locations as $location => $description ) {

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, '…');
 
         $post_title = apply_filters('the_title', $post->post_title, $post->ID);
         $post_title = strip_tags($post_title);

wp-includes/formatting.php

@@ -2199 +2199 @@
  *
  * @param string $text Text to trim.
  * @param int $num_words Number of words. Default 55.
- * @param string $more What to append if $text needs to be trimmed. Default '…'.
+ * @param string $more Optional. What to append if $text needs to be trimmed. Default '…'.
  * @return string Trimmed text.
  */
 function wp_trim_words( $text, $num_words = 55, $more = null ) {
@@ -3118 +3118 @@
  *
  * @param integer $str String to get the excerpt from.
  * @param integer $count Maximum number of characters to take.
+ * @param string $more Optional. What to append if $str needs to be trimmed. Defaults to empty string.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count ) {
+function wp_html_excerpt( $str, $count, $more = null ) {
+        if ( null === $more )
+                $more = '';
         $str = wp_strip_all_tags( $str, true );
-        $str = mb_substr( $str, 0, $count );
+        $excerpt = mb_substr( $str, 0, $count );
         // remove part of an entity at the end
-        $str = preg_replace( '/&[^;\s]{0,6}$/', '', $str );
-        return $str;
+        $excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
+        if ( $str != $excerpt )
+                $excerpt = trim( $excerpt ) . $more;
+        return $excerpt;
 }
 
 /**

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, '…' );
+        $excerpt = wp_html_excerpt( $excerpt, 252, '…' );
 
         $comment_post_ID = (int) $tb_id;
         $comment_author = $blog_name;