From 95ffc6e5625b6dc9c750c2d6b8ad9be61d9e1864 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 28 Nov 2014 08:12:13 +0000 Subject: [PATCH] Consistently handle an empty site title in Site and My Sites toolbar menus. see #28682. git-svn-id: https://develop.svn.wordpress.org/trunk@30598 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/admin-bar.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php index 8331af5293..32853c3a14 100644 --- a/src/wp-includes/admin-bar.php +++ b/src/wp-includes/admin-bar.php @@ -270,8 +270,9 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) { $blogname = get_bloginfo('name'); - if ( empty( $blogname ) ) + if ( ! $blogname ) { $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() ); + } if ( is_network_admin() ) { $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) ); @@ -402,7 +403,12 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { $blavatar = '
'; - $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname; + $blogname = $blog->blogname; + + if ( ! $blogname ) { + $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() ); + } + $menu_id = 'blog-' . $blog->userblog_id; $wp_admin_bar->add_menu( array(