Changeset 18919

Timestamp:

10/07/2011 07:52:26 PM (15 years ago)

Author:

koopersmith

Message:

Clean up the 'Site Name' admin bar functions.

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (4 diffs)
• class-wp-admin-bar.php (modified) (2 diffs)

trunk/wp-includes/admin-bar.php

@@ -220 +220 @@
 
 /**
- * Add the "Blog Name" menu in the front end.
+ * Add the "Site Name" menu.
  *
  * @since 3.3.0
  */
-function wp_admin_bar_blog_front_menu( $wp_admin_bar ) {
+function wp_admin_bar_site_menu( $wp_admin_bar ) {
+        global $current_site;
+
         if ( ! is_user_logged_in() )
                 return;
@@ -232 +234 @@
         if ( empty( $blogname ) )
                 $blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
+
+        if ( is_network_admin() ) {
+                $blogname = sprintf( __('Network Admin: %s'), esc_html( $current_site->site_name ) );
+        } elseif ( is_user_admin() ) {
+                $blogname = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) );
+        }
 
         $title = wp_html_excerpt( $blogname, 40 );
@@ -238 +246 @@
 
         $wp_admin_bar->add_menu( array(
-                'id'    => 'blog-name',
+                'id'    => 'site-name',
                 'title' => $title,
-                'href'  => admin_url(),
-        ) );
-
-        // Add Dashboard item.
-        $wp_admin_bar->add_menu( array(
-                'id'     => 'dashboard',
-                'title'  => __( 'Dashboard' ),
-                'href'   => admin_url(),
-                'parent' => 'blog-name',
-        ) );
-
-        wp_admin_bar_appearance_menu( $wp_admin_bar );
-}
-
-/**
- * Add the "Blog Name" menu in the admin.
- *
- * @since 3.3.0
- */
-function wp_admin_bar_blog_admin_menu( $wp_admin_bar ) {
-        global $current_site;
-
-        if ( is_network_admin() ) {
-                $title = sprintf( __('Network Admin: %s'), esc_html($current_site->site_name) );
-                $url   = '#';
-        } elseif ( is_user_admin() ) {
-                $title = sprintf( __('Global Dashboard: %s'), esc_html($current_site->site_name) );
-                $url   = '#';
+                'href'  => is_admin() ? home_url() : admin_url(),
+        ) );
+
+        // Create submenu items.
+
+        if ( is_admin() ) {
+                // Add an option to visit the site.
+                $wp_admin_bar->add_menu( array(
+                        'parent' => 'site-name',
+                        'id'     => 'view-site',
+                        'title'  => __( 'Visit Site' ),
+                        'href'   => home_url(),
+                ) );
+
+        // We're on the front end, print a copy of the admin menu.
         } else {
-                $title = get_bloginfo('name');
-                $url   = get_home_url();
-
-                if ( empty( $title ) )
-                        $title = preg_replace( '#^(https?://)?(www.)?#', '', $url );
-        }
-
-        $title_excerpt = wp_html_excerpt( $title, 40 );
-        if ( $title != $title_excerpt )
-                $title_excerpt = trim( $title_excerpt ) . '…';
-
-        $wp_admin_bar->add_menu( array(
-                'id'    => 'blog-name',
-                'title' => $title_excerpt,
-                'href'  => $url,
-        ) );
-
-        $wp_admin_bar->add_menu( array(
-                'parent' => 'blog-name',
-                'id'     => 'view-site',
-                'title'  => __( 'Visit Site' ),
-                'href'   => home_url(),
-        ) );
+                // Add the dashboard item.
+                $wp_admin_bar->add_menu( array(
+                        'parent' => 'site-name',
+                        'id'     => 'dashboard',
+                        'title'  => __( 'Dashboard' ),
+                        'href'   => admin_url(),
+                ) );
+
+                // Add the appearance menu.
+                wp_admin_bar_appearance_menu( $wp_admin_bar );
+        }
 }
 
@@ -587 +570 @@
                 'title'  => __('Appearance'),
                 'href'   => admin_url('themes.php'),
-                'parent' => 'blog-name',
+                'parent' => 'site-name',
         ) );
 

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

@@ -180 +180 @@
                 add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
                 add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
+                add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
                 add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
 
@@ -189 +190 @@
 
                 if ( ! is_admin() ) {
-                        add_action( 'admin_bar_menu', 'wp_admin_bar_blog_front_menu', 30 );
                         add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 );
                 } else {
-                        add_action( 'admin_bar_menu', 'wp_admin_bar_blog_admin_menu', 30 );
                         add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 90 );
                 }