wordpress core update 5.4

e558cb36 · agata · b38c3605 · e558cb36 · e558cb36 · e558cb36
Commit e558cb36 authored Apr 09, 2020 by agata
20 changed files
--- a/index.php
+++ b/index.php
@@ -14,4 +14,4 @@
 define( 'WP_USE_THEMES', true );

 /** Loads the WordPress Environment and Template */
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require __DIR__ . '/wp-blog-header.php';
--- a/license.txt
+++ b/license.txt
 WordPress - Web publishing software

-Copyright 2011-2019 by the contributors
+Copyright 2011-2020 by the contributors

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,8 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 This program incorporates work covered by the following copyright and
 permission notices:

-  b2 is (c) 2001, 2002 Michel Valdrighi - m@tidakada.com -
-  http://tidakada.com
+  b2 is (c) 2001, 2002 Michel Valdrighi - https://cafelog.com

  Wherever third party code has been used, credit has been given in the code's
  comments.

--- a/readme.html
+++ b/readme.html
@@ -33,7 +33,6 @@

 <h2>Updating</h2>
 <h3>Using the Automatic Updater</h3>
-<p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
 <ol>
 	<li>Open <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
 	<li>You wanted more, perhaps? That&#8217;s it!</li>

--- a/wp-activate.php
+++ b/wp-activate.php
@@ -9,9 +9,9 @@
 define( 'WP_INSTALLING', true );

 /** Sets up the WordPress Environment. */
-require( dirname( __FILE__ ) . '/wp-load.php' );
+require __DIR__ . '/wp-load.php';

-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require __DIR__ . '/wp-blog-header.php';

 if ( ! is_multisite() ) {
 	wp_redirect( wp_registration_url() );
@@ -37,7 +37,7 @@ if ( isset( $_GET['key'] ) && isset( $_POST['key'] ) && $_GET['key'] !== $_POST[
 if ( $key ) {
 	$redirect_url = remove_query_arg( 'key' );

-	if ( $redirect_url !== remove_query_arg( false ) ) {
+	if ( remove_query_arg( false ) !== $redirect_url ) {
 		setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
 		wp_safe_redirect( $redirect_url );
 		exit;
@@ -46,13 +46,13 @@ if ( $key ) {
 	}
 }

-if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
+if ( null === $result && isset( $_COOKIE[ $activate_cookie ] ) ) {
 	$key    = $_COOKIE[ $activate_cookie ];
 	$result = wpmu_activate_signup( $key );
 	setcookie( $activate_cookie, ' ', time() - YEAR_IN_SECONDS, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
 }

-if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
+if ( null === $result || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
 	status_header( 404 );
 } elseif ( is_wp_error( $result ) ) {
 	$error_code = $result->get_error_code();
@@ -68,7 +68,7 @@ if ( is_object( $wp_object_cache ) ) {
 	$wp_object_cache->cache_enabled = false;
 }

-// Fix for page title
+// Fix for page title.
 $wp_query->is_404 = false;

 /**
@@ -142,7 +142,7 @@ get_header( 'wp-activate' );
 			<h2><?php _e( 'Your account is now active!' ); ?></h2>
 			<?php
 			echo '<p class="lead-in">';
-			if ( $signup->domain . $signup->path == '' ) {
+			if ( '' === $signup->domain . $signup->path ) {
 				printf(
 					/* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
 					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
@@ -162,7 +162,7 @@ get_header( 'wp-activate' );
 				);
 			}
 			echo '</p>';
-		} elseif ( $result === null || is_wp_error( $result ) ) {
+		} elseif ( null === $result || is_wp_error( $result ) ) {
 			?>
 			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 			<?php if ( is_wp_error( $result ) ) : ?>
@@ -181,7 +181,7 @@ get_header( 'wp-activate' );
 			</div>

 			<?php
-			if ( $url && $url != network_home_url( '', 'http' ) ) :
+			if ( $url && network_home_url( '', 'http' ) !== $url ) :
 				switch_to_blog( (int) $result['blog_id'] );
 				$login_url = wp_login_url();
 				restore_current_blog();

--- a/wp-admin/about.php
+++ b/wp-admin/about.php
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -19,7 +19,7 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 }

 /** Load WordPress Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once dirname( __DIR__ ) . '/wp-load.php';

 /** Allow for cross-domain requests (from the front end). */
 send_origin_headers();
@@ -27,16 +27,16 @@ send_origin_headers();
 header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
 header( 'X-Robots-Tag: noindex' );

-// Require an action parameter
+// Require an action parameter.
 if ( empty( $_REQUEST['action'] ) ) {
 	wp_die( '0', 400 );
 }

 /** Load WordPress Administration APIs */
-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once ABSPATH . 'wp-admin/includes/admin.php';

 /** Load Ajax Handlers for WordPress Core */
-require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';

 send_nosniff_header();
 nocache_headers();
@@ -141,7 +141,7 @@ $core_actions_post = array(
 	'health-check-get-sizes',
 );

-// Deprecated
+// Deprecated.
 $core_actions_post_deprecated = array( 'wp-fullscreen-save-post', 'press-this-save-post', 'press-this-add-category' );
 $core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );

@@ -189,5 +189,5 @@ if ( is_user_logged_in() ) {
 	 */
 	do_action( "wp_ajax_nopriv_{$action}" );
 }
-// Default status
+// Default status.
 wp_die( '0' );
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -6,7 +6,7 @@
 * @subpackage Administration
 */

-// don't load directly
+// Don't load directly.
 if ( ! defined( 'ABSPATH' ) ) {
 	die( '-1' );
 }
@@ -104,7 +104,7 @@ do_action( 'admin_print_footer_scripts' );
 */
 do_action( "admin_footer-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

-// get_site_option() won't exist when auto upgrading from <= 2.7
+// get_site_option() won't exist when auto upgrading from <= 2.7.
 if ( function_exists( 'get_site_option' ) ) {
 	if ( false === get_site_option( 'can_compress_scripts' ) ) {
 		compression_test();

--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -12,4 +12,4 @@
 _deprecated_file( basename( __FILE__ ), '2.5.0', 'wp-admin/includes/admin.php' );

 /** WordPress Administration API: Includes all Administration functions. */
-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once ABSPATH . 'wp-admin/includes/admin.php';
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -8,7 +8,7 @@

 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';
 }

 /**
@@ -233,7 +233,7 @@ if ( current_user_can( 'customize' ) ) {
 ?>

 <div id="wpwrap">
-<?php require( ABSPATH . 'wp-admin/menu-header.php' ); ?>
+<?php require ABSPATH . 'wp-admin/menu-header.php'; ?>
 <div id="wpcontent">

 <?php
@@ -288,6 +288,6 @@ if ( is_network_admin() ) {
 */
 do_action( 'all_admin_notices' );

-if ( $parent_file == 'options-general.php' ) {
-	require( ABSPATH . 'wp-admin/options-head.php' );
+if ( 'options-general.php' === $parent_file ) {
+	require ABSPATH . 'wp-admin/options-head.php';
 }
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -14,15 +14,15 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 }

 if ( defined( 'ABSPATH' ) ) {
-	require_once( ABSPATH . 'wp-load.php' );
+	require_once ABSPATH . 'wp-load.php';
 } else {
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+	require_once dirname( __DIR__ ) . '/wp-load.php';
 }

 /** Allow for cross-domain requests (from the front end). */
 send_origin_headers();

-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once ABSPATH . 'wp-admin/includes/admin.php';

 nocache_headers();


--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -31,7 +31,7 @@ if ( isset( $_GET['import'] ) && ! defined( 'WP_LOAD_IMPORTERS' ) ) {
 	define( 'WP_LOAD_IMPORTERS', true );
 }

-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once dirname( __DIR__ ) . '/wp-load.php';

 nocache_headers();

@@ -72,8 +72,8 @@ if ( get_option( 'db_upgraded' ) ) {
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
-			require_once( ABSPATH . WPINC . '/http.php' );
+		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) === 1 ) ) {
+			require_once ABSPATH . WPINC . '/http.php';
 			$response = wp_remote_get(
 				admin_url( 'upgrade.php?step=1' ),
 				array(
@@ -89,16 +89,16 @@ if ( get_option( 'db_upgraded' ) ) {
 	}
 }

-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once ABSPATH . 'wp-admin/includes/admin.php';

 auth_redirect();

-// Schedule trash collection
+// Schedule Trash collection.
 if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
 }

-// Schedule Transient cleanup.
+// Schedule transient cleanup.
 if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {
 	wp_schedule_event( time(), 'daily', 'delete_expired_transients' );
 }
@@ -146,11 +146,11 @@ if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] )
 }

 if ( WP_NETWORK_ADMIN ) {
-	require( ABSPATH . 'wp-admin/network/menu.php' );
+	require ABSPATH . 'wp-admin/network/menu.php';
 } elseif ( WP_USER_ADMIN ) {
-	require( ABSPATH . 'wp-admin/user/menu.php' );
+	require ABSPATH . 'wp-admin/user/menu.php';
 } else {
-	require( ABSPATH . 'wp-admin/menu.php' );
+	require ABSPATH . 'wp-admin/menu.php';
 }

 if ( current_user_can( 'manage_options' ) ) {
@@ -181,8 +181,8 @@ if ( isset( $plugin_page ) ) {
 		$page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );

 		// Back-compat for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
-			// There could be plugin specific params on the URL, so we need the whole query string
+		if ( empty( $page_hook ) && 'edit.php' === $pagenow && get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
+			// There could be plugin specific params on the URL, so we need the whole query string.
 			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
 				$query_string = $_SERVER['QUERY_STRING'];
 			} else {
@@ -231,7 +231,7 @@ if ( isset( $plugin_page ) ) {
 		 */
 		do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 		if ( ! isset( $_GET['noheader'] ) ) {
-			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+			require_once ABSPATH . 'wp-admin/admin-header.php';
 		}

 		/**
@@ -277,17 +277,17 @@ if ( isset( $plugin_page ) ) {
 		do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores

 		if ( ! isset( $_GET['noheader'] ) ) {
-			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+			require_once ABSPATH . 'wp-admin/admin-header.php';
 		}

 		if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
-			include( WPMU_PLUGIN_DIR . "/$plugin_page" );
+			include WPMU_PLUGIN_DIR . "/$plugin_page";
 		} else {
-			include( WP_PLUGIN_DIR . "/$plugin_page" );
+			include WP_PLUGIN_DIR . "/$plugin_page";
 		}
 	}

-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once ABSPATH . 'wp-admin/admin-footer.php';

 	exit();
 } elseif ( isset( $_GET['import'] ) ) {
@@ -322,10 +322,10 @@ if ( isset( $plugin_page ) ) {
 	$title        = __( 'Import' );

 	if ( ! isset( $_GET['noheader'] ) ) {
-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once ABSPATH . 'wp-admin/admin-header.php';
 	}

-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once ABSPATH . 'wp-admin/includes/upgrade.php';

 	define( 'WP_IMPORTING', true );

@@ -345,9 +345,9 @@ if ( isset( $plugin_page ) ) {

 	call_user_func( $wp_importers[ $importer ][2] );

-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once ABSPATH . 'wp-admin/admin-footer.php';

-	// Make sure rules are flushed
+	// Make sure rules are flushed.
 	flush_rewrite_rules( false );

 	exit();
@@ -370,16 +370,16 @@ if ( isset( $plugin_page ) ) {
 	 * The following hooks are fired to ensure backward compatibility.
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
-	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' ) {
+	if ( 'page' === $typenow ) {
+		if ( 'post-new.php' === $pagenow ) {
 			do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		} elseif ( $pagenow == 'post.php' ) {
+		} elseif ( 'post.php' === $pagenow ) {
 			do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 		}
-	} elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' ) {
+	} elseif ( 'edit-tags.php' === $pagenow ) {
+		if ( 'category' === $taxnow ) {
 			do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-		} elseif ( $taxnow == 'link_category' ) {
+		} elseif ( 'link_category' === $taxnow ) {
 			do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 		}
 	} elseif ( 'term.php' === $pagenow ) {

--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -15,17 +15,17 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 }

 if ( defined( 'ABSPATH' ) ) {
-	require_once( ABSPATH . 'wp-load.php' );
+	require_once ABSPATH . 'wp-load.php';
 } else {
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+	require_once dirname( __DIR__ ) . '/wp-load.php';
 }

-require_once( ABSPATH . 'wp-admin/admin.php' );
+require_once ABSPATH . 'wp-admin/admin.php';

 header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );

 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+	require ABSPATH . 'wp-admin/includes/ajax-actions.php';

 	send_nosniff_header();
 	nocache_headers();
@@ -38,7 +38,7 @@ if ( ! current_user_can( 'upload_files' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
 }

-// just fetch the detail form for that attachment
+// Just fetch the detail form for that attachment.
 if ( isset( $_REQUEST['attachment_id'] ) && intval( $_REQUEST['attachment_id'] ) && $_REQUEST['fetch'] ) {
 	$id   = intval( $_REQUEST['attachment_id'] );
 	$post = get_post( $id );
@@ -112,7 +112,7 @@ if ( $_REQUEST['short'] ) {
 	// Short form response - attachment ID only.
 	echo $id;
 } else {
-	// Long form response - big chunk of html.
+	// Long form response - big chunk of HTML.
 	$type = $_REQUEST['type'];

 	/**

--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -7,7 +7,7 @@
 */

 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';

 $parent_file  = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -58,7 +58,7 @@ switch ( $action ) {
 		);

 		wp_enqueue_script( 'comment' );
-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once ABSPATH . 'wp-admin/admin-header.php';

 		$comment_id = absint( $_GET['c'] );

@@ -77,7 +77,7 @@ switch ( $action ) {

 		$comment = get_comment_to_edit( $comment_id );

-		include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+		require ABSPATH . 'wp-admin/edit-form-comment.php';

 		break;

@@ -101,12 +101,12 @@ switch ( $action ) {
 		}

 		// No need to re-approve/re-trash/re-spam a comment.
-		if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+		if ( str_replace( '1', 'approve', $comment->comment_approved ) == $action ) {
 			wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
 			die();
 		}

-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once ABSPATH . 'wp-admin/admin-header.php';

 		$formaction    = $action . 'comment';
 		$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
@@ -137,7 +137,7 @@ switch ( $action ) {
 				break;
 		}

-		if ( $comment->comment_approved != '0' ) { // if not unapproved
+		if ( '0' != $comment->comment_approved ) { // If not unapproved.
 			$message = '';
 			switch ( $comment->comment_approved ) {
 				case '1':
@@ -207,9 +207,9 @@ switch ( $action ) {
 		$submitted = sprintf(
 			/* translators: 1: Comment date, 2: Comment time. */
 			__( '%1$s at %2$s' ),
-			/* translators: Comment date format. See https://secure.php.net/date */
+			/* translators: Comment date format. See https://www.php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
-			/* translators: Comment time format. See https://secure.php.net/date */
+			/* translators: Comment time format. See https://www.php.net/date */
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
 		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
@@ -355,6 +355,6 @@ switch ( $action ) {
 	default:
 		wp_die( __( 'Unknown action.' ) );

-} // end switch
+} // End switch.

-include( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once ABSPATH . 'wp-admin/admin-footer.php';
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -7,14 +7,14 @@
 */

 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require_once( dirname( __FILE__ ) . '/includes/credits.php' );
+require_once __DIR__ . '/admin.php';
+require_once __DIR__ . '/includes/credits.php';

 $title = __( 'Credits' );

 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );

-include( ABSPATH . 'wp-admin/admin-header.php' );
+require_once ABSPATH . 'wp-admin/admin-header.php';

 $credits = wp_credits();
 ?>
@@ -22,23 +22,15 @@ $credits = wp_credits();

 	<div class="about__header">
 		<div class="about__header-title">
-			<h1>
-				<span><?php echo $display_version; ?></span>
+			<p>
 				<?php _e( 'WordPress' ); ?>
-			</h1>
+				<span><?php echo $display_version; ?></span>
+			</p>
 		</div>

-		<div class="about__header-badge"></div>
-
 		<div class="about__header-text">
 			<p>
-				<?php
-				printf(
-					/* translators: %s: The current WordPress version number. */
-					__( 'Introducing our most refined user experience with the improved block editor in WordPress %s!' ),
-					$display_version
-				);
-				?>
+				<?php _e( 'Building more with blocks, faster and easier.' ); ?>
 			</p>
 		</div>

@@ -50,39 +42,50 @@ $credits = wp_credits();
 		</nav>
 	</div>

-	<div class="about__section">
+	<div class="about__section is-feature">
 		<div class="column">
-			<h2><?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?></h2>
+			<h1><?php _e( 'Credits' ); ?></h1>
+
+			<?php if ( ! $credits ) : ?>
+
+			<p>
+				<?php
+				printf(
+					/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
+					__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+					__( 'https://wordpress.org/about/' ),
+					__( 'https://make.wordpress.org/' )
+				);
+				?>
+			</p>

+			<?php else : ?>
+
+			<p>
+				<?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?>
+			</p>
 			<p>
 				<?php
-				if ( ! $credits ) {
-					printf(
-						/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-						__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
-						__( 'https://wordpress.org/about/' ),
-						__( 'https://make.wordpress.org/' )
-					);
-				} else {
-					printf(
-						/* translators: %s: https://make.wordpress.org/ */
-						__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-						__( 'https://make.wordpress.org/' )
-					);
-				}
+				printf(
+					/* translators: %s: https://make.wordpress.org/ */
+					__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+					__( 'https://make.wordpress.org/' )
+				);
 				?>
 			</p>
+
+			<?php endif; ?>
 		</div>

 		<div class="about__image aligncenter">
-			<img src="data:image/svg+xml;charset=utf8,%3Csvg width='1320' height='350' viewbox='0 0 1320 350' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 61 220)' fill='%23321017'/%3E%3Crect width='72' height='250' transform='matrix(1 0 0 -1 166 300)' fill='%23BD3854'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 272 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 378 220)' fill='%235F1B29'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 483 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 587 220)' fill='%235F1B29'/%3E%3Crect width='71.28' height='250' transform='matrix(1 0 0 -1 689 300)' fill='%23BD3854'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 884 220)' fill='%235F1B29'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 789 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 985 220)' fill='%23321017'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 1084 220)' fill='%235F1B29'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 1179 220)' fill='%233D0F19'/%3E%3C/svg%3E%0A" alt="" />
+			<img src="data:image/svg+xml;charset=utf8,%3Csvg width='1000' height='300' viewbox='0 0 1000 300' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23F3F4F5' d='M0 0h1000v300H0z'/%3E%3Cpath style='mix-blend-mode:multiply' d='M39.6 140.22l931.1 3.36.8 76.5-929.5 6.6-2.4-86.46z' fill='%23216DD2'/%3E%3Cpath style='mix-blend-mode:multiply' d='M963.7 275.14s-.9-59.58-1-64.14c-.1-4.2-932.3 1.74-932.3 1.74L29 268.48v8.4' fill='%237FCDE6'/%3E%3Cpath style='mix-blend-mode:multiply' d='M958 73.32L47.8 70.26l1.2 78.66 907.3 4.26 1.7-79.86z' fill='%23072CF0'/%3E%3Cpath style='mix-blend-mode:multiply' d='M34 91.32l910.4-2.16L939.2 21 33.3 23.82l.7 67.5z' fill='%230188D9'/%3E%3C/svg%3E" alt="" />
 		</div>
 	</div>

 <?php
 if ( ! $credits ) {
 	echo '</div>';
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once ABSPATH . 'wp-admin/admin-footer.php';
 	exit;
 }
 ?>
@@ -129,11 +132,11 @@ if ( ! $credits ) {
 </div>
 <?php

-include( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once ABSPATH . 'wp-admin/admin-footer.php';

 return;

-// These are strings returned by the API that we want to be translatable
+// These are strings returned by the API that we want to be translatable.
 __( 'Project Leaders' );
 /* translators: %s: The current WordPress version number. */
 __( 'Core Contributors to WordPress %s' );

--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
+/*! This file is auto-generated */
 /*------------------------------------------------------------------------------
  22.0 - About Pages

@@ -20,17 +21,19 @@

 .about__container {
 	/* Section backgrounds */
-	--background: #f4efe1;
-	--subtle-background: #d7d2c5;
+	--background: #f3f4f5;
+	--subtle-background: #bde7f0;
 	/* Main text color */
-	--text: #413e38;
+	--text: #32373c;
+	--text-light: #f3f4f5;
 	/* Navigation colors. */
-	--nav-background: #fefcf7;
-	--nav-color: #716d64;
+