Changeset 24214

Timestamp:

05/09/2013 12:22:02 AM (12 years ago)

Author:

SergeyBiryukov

Message:

• Pass ellipsis as a parameter to wp_html_excerpt() instead of appending it manually.
• Consolidate the logic to avoid appending ellipsis if the entire string is shown.
• Show ellipsis after truncated filenames and post titles.

props solarissmoke, bpetty, SergeyBiryukov. fixes #11446.

Location:

trunk

Files:

• wp-admin/async-upload.php (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (3 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-trackback.php (modified) (1 diff)

trunk/wp-admin/async-upload.php

@@ -58 +58 @@
             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 :

trunk/wp-admin/edit-comments.php

@@ -106 +106 @@
 
 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');
@@ -144 +144 @@
 <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;' )
         )
     );
@@ -154 +154 @@
 
 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>
 

trunk/wp-admin/includes/dashboard.php

@@ -828 +828 @@
 
         $content = $item->get_content();
-        $content = wp_html_excerpt($content, 50) . ' …';
+        $content = wp_html_excerpt( $content, 50, ' …' );
 
         if ( $link )

trunk/wp-admin/includes/media.php

@@ -1160 +1160 @@
 
     $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 ) );

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

trunk/wp-admin/nav-menus.php

@@ -437 +437 @@
 // 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, '…' );
 }
 
@@ -573 +569 @@
                                     <?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; ?>

trunk/wp-includes/admin-bar.php

@@ -230 +230 @@
     }
 
-    $title = wp_html_excerpt( $blogname, 40 );
-    if ( $title != $blogname )
-        $title = trim( $title ) . '…';
+    $title = wp_html_excerpt( $blogname, 40, '…' );
 
     $wp_admin_bar->add_menu( array(

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

@@ -898 +898 @@
             $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, '…' );
             }
 

trunk/wp-includes/comment.php

@@ -1754 +1754 @@
         $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);

trunk/wp-includes/formatting.php

@@ -2200 +2200 @@
  * @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.
  */
@@ -3119 +3119 @@
  * @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;
 }
 

trunk/wp-trackback.php

@@ -88 +88 @@
         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;