diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 88768d2e8..1517b7fbd 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -13,14 +13,25 @@ if ( ! defined( 'WP_ADMIN' ) ) get_admin_page_title(); $title = esc_html( strip_tags( $title ) ); -$admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, get_bloginfo( 'name' ) ); +if ( is_network_admin() ) + $admin_title = __( 'Network Admin' ); +elseif ( is_user_admin() ) + $admin_title = __( 'Global Dashboard' ); +else + $admin_title = get_bloginfo( 'name' ); + +if ( $admin_title == $title ) + $admin_title = sprintf( __( '%1$s — WordPress' ), $title ); +else + $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title ); + $admin_title = apply_filters( 'admin_title', $admin_title, $title ); wp_user_settings(); wp_menu_unfold(); // Save the ID of the last blog admin area visited if super admin. -if ( is_multisite() && !is_network_admin() && is_super_admin() ) { +if ( is_multisite() && is_blog_admin() && is_super_admin() ) { $last_blog = get_user_option('last-blog-admin-visited'); if ( $last_blog != $blog_id ) update_user_option(get_current_user_id(), 'last-blog-admin-visited', $blog_id, true); @@ -102,9 +113,9 @@ document.body.className = c; site_name); + $blog_name = sprintf( __('%s Network Admin'), esc_html($current_site->site_name) ); elseif ( is_user_admin() ) - $blog_name = __('Global Dashboard'); + $blog_name = sprintf( __('%s Global Dashboard'), esc_html($current_site->site_name) ); else $blog_name = get_bloginfo('name', 'display'); if ( '' == $blog_name ) { diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php index 26a437714..f22ebbd3f 100644 --- a/wp-admin/network/index.php +++ b/wp-admin/network/index.php @@ -19,7 +19,7 @@ if ( !is_multisite() ) if ( ! current_user_can( 'manage_network' ) ) wp_die( __( 'You do not have permission to access this page.' ) ); -$title = __( 'Network Dashboard' ); +$title = __( 'Dashboard' ); $parent_file = 'index.php'; add_contextual_help($current_screen,