Changeset 30598 for trunk/src/wp-includes/admin-bar.php

Timestamp:

11/28/2014 08:12:13 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Consistently handle an empty site title in Site and My Sites toolbar menus.

see #28682.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (2 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -271 +271 @@
         $blogname = get_bloginfo('name');
 
-        if ( empty( $blogname ) )
+        if ( ! $blogname ) {
                 $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+        }
 
         if ( is_network_admin() ) {
@@ -403 +404 @@
                 $blavatar = '<div class="blavatar"></div>';
 
-                $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;