Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-18 06:11:30 +01:00
Code Issues Projects Releases Wiki Activity

Coding Standards: Use strict comparison for $wp_db_version check in wp-admin/network/upgrade.php.

Browse Source 
Follow-up to [47787], [47788].

See #50155, #49542.
Built from https://develop.svn.wordpress.org/trunk@47852


git-svn-id: http://core.svn.wordpress.org/trunk@47628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-05-24 09:15:07 +00:00
parent 5b4174e409
commit 5899bf0f32
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/network/upgrade.php
View File

@ -90,6 +90,7 @@ switch ( $action ) {
'sslverify' => false, 'sslverify' => false,
) )
); );
if ( is_wp_error( $response ) ) { if ( is_wp_error( $response ) ) {
wp_die( wp_die(
sprintf( sprintf(
@ -109,6 +110,7 @@ switch ( $action ) {
* @param array|WP_Error $response The upgrade response array or WP_Error on failure. * @param array|WP_Error $response The upgrade response array or WP_Error on failure.
*/ */
do_action( 'after_mu_upgrade', $response ); do_action( 'after_mu_upgrade', $response );
/** /**
* Fires after each site has been upgraded. * Fires after each site has been upgraded.
* *
@ -132,7 +134,7 @@ switch ( $action ) {
break; break;
case 'show': case 'show':
default: default:
if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) : if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $GLOBALS['wp_db_version'] ) :
?> ?>
<h2><?php _e( 'Database Update Required' ); ?></h2> <h2><?php _e( 'Database Update Required' ); ?></h2>
<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p> <p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47851'; $wp_version = '5.5-alpha-47852';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.