Changeset 24214 for trunk/wp-admin/nav-menus.php

Timestamp:

05/09/2013 12:22:02 AM (13 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.

File:

• trunk/wp-admin/nav-menus.php (modified) (2 diffs)

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; ?>