* 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@24214 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2013-05-09 00:22:02 +00:00
parent cb0bd68404
commit 7cf933b2c9
11 changed files with 27 additions and 34 deletions
+1 -3
View File
@@ -229,9 +229,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
$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',