X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/849f15aeed7a5e39314057bdc0064d8edd60dd7d..c81aba3d563f7459dc79140e4c5be67bcf506b92:/wp-admin/network/upgrade.php
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index dcca3deb..c885a848 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -29,17 +29,17 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'
';
-echo '
' . __( 'Upgrade Network' ) . '
';
+echo '
' . __( 'Upgrade Network' ) . '
';
$action = isset($_GET['action']) ? $_GET['action'] : 'show';
@@ -48,6 +48,9 @@ switch ( $action ) {
$n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0;
if ( $n < 5 ) {
+ /**
+ * @global string $wp_db_version
+ */
global $wp_db_version;
update_site_option( 'wpmu_upgrade_site', $wp_db_version );
}
@@ -63,10 +66,19 @@ switch ( $action ) {
$siteurl = site_url();
$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
restore_current_blog();
+
echo "
$siteurl";
+
$response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
- if ( is_wp_error( $response ) )
- wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message:
%2$s' ), $siteurl, $response->get_error_message() ) );
+ if ( is_wp_error( $response ) ) {
+ wp_die( sprintf(
+ /* translators: 1: site url, 2: server error message */
+ __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
+ $siteurl,
+ '
' . $response->get_error_message() . ''
+ ) );
+ }
+
/**
* Fires after the Multisite DB upgrade for each site is complete.
*
@@ -99,12 +111,12 @@ switch ( $action ) {
default:
if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
?>
-
+
-
-
+
+