diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/admin-header.php --- a/wp/wp-admin/admin-header.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-admin/admin-header.php Tue Dec 15 13:49:49 2020 +0100 @@ -6,9 +6,9 @@ * @subpackage Administration */ -@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); +header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); if ( ! defined( 'WP_ADMIN' ) ) { - require_once( dirname( __FILE__ ) . '/admin.php' ); + require_once __DIR__ . '/admin.php'; } /** @@ -16,8 +16,8 @@ * * @global string $title * @global string $hook_suffix - * @global WP_Screen $current_screen - * @global WP_Locale $wp_locale + * @global WP_Screen $current_screen WordPress current screen object. + * @global WP_Locale $wp_locale WordPress date and time locale object. * @global string $pagenow * @global string $update_title * @global int $total_update_count @@ -32,23 +32,23 @@ } get_admin_page_title(); -$title = esc_html( strip_tags( $title ) ); +$title = strip_tags( $title ); if ( is_network_admin() ) { - /* translators: Network admin screen title. %s: Network name */ - $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) ); + /* translators: Network admin screen title. %s: Network title. */ + $admin_title = sprintf( __( 'Network Admin: %s' ), get_network()->site_name ); } elseif ( is_user_admin() ) { - /* translators: User dashboard screen title. %s: Network name */ - $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) ); + /* translators: User dashboard screen title. %s: Network title. */ + $admin_title = sprintf( __( 'User Dashboard: %s' ), get_network()->site_name ); } else { $admin_title = get_bloginfo( 'name' ); } -if ( $admin_title == $title ) { - /* translators: Admin screen title. %s: Admin screen name */ +if ( $admin_title === $title ) { + /* translators: Admin screen title. %s: Admin screen name. */ $admin_title = sprintf( __( '%s — WordPress' ), $title ); } else { - /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */ + /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name. */ $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title ); } @@ -71,18 +71,17 @@ _wp_admin_html_begin(); ?> -<?php echo $admin_title; ?> +<?php echo esc_html( $admin_title ); ?> -
- +