diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/admin-header.php --- a/wp/wp-admin/admin-header.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/admin-header.php Mon Oct 14 17:39:30 2019 +0200 @@ -10,8 +10,19 @@ if ( ! defined( 'WP_ADMIN' ) ) require_once( dirname( __FILE__ ) . '/admin.php' ); -// In case admin-header.php is included in a function. -global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, +/** + * In case admin-header.php is included in a function. + * + * @global string $title + * @global string $hook_suffix + * @global WP_Screen $current_screen + * @global WP_Locale $wp_locale + * @global string $pagenow + * @global string $update_title + * @global int $total_update_count + * @global string $parent_file + */ +global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $update_title, $total_update_count, $parent_file; // Catch plugins that include admin-header.php before admin.php completes. @@ -21,20 +32,26 @@ get_admin_page_title(); $title = esc_html( strip_tags( $title ) ); -if ( is_network_admin() ) - $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) ); -elseif ( is_user_admin() ) - $admin_title = sprintf( __( 'Global Dashboard: %s' ), esc_html( get_current_site()->site_name ) ); -else +if ( is_network_admin() ) { + /* translators: Network admin screen title. 1: Network name */ + $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) ); +} elseif ( is_user_admin() ) { + /* translators: User dashboard screen title. 1: Network name */ + $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) ); +} else { $admin_title = get_bloginfo( 'name' ); +} -if ( $admin_title == $title ) +if ( $admin_title == $title ) { + /* translators: Admin screen title. 1: Admin screen name */ $admin_title = sprintf( __( '%1$s — WordPress' ), $title ); -else +} else { + /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */ $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title ); +} /** - * Filter the title tag content for an admin page. + * Filters the title tag content for an admin page. * * @since 3.1.0 * @@ -84,7 +101,7 @@ * * @since 2.6.0 */ -do_action( "admin_print_styles-$hook_suffix" ); +do_action( "admin_print_styles-{$hook_suffix}" ); /** * Fires when styles are printed for all admin pages. @@ -98,7 +115,7 @@ * * @since 2.1.0 */ -do_action( "admin_print_scripts-$hook_suffix" ); +do_action( "admin_print_scripts-{$hook_suffix}" ); /** * Fires when scripts are printed for all admin pages. @@ -115,7 +132,7 @@ * * @since 2.1.0 */ -do_action( "admin_head-$hook_suffix" ); +do_action( "admin_head-{$hook_suffix}" ); /** * Fires in head section for all admin pages. @@ -142,10 +159,10 @@ if ( $current_screen->taxonomy ) $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy; -$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) ); -$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) ); +$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) ); +$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) ); $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' ); -$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) ); +$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) ); if ( wp_is_mobile() ) $admin_body_class .= ' mobile'; @@ -162,7 +179,7 @@