X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..refs/tags/wordpress-4.3:/wp-admin/network/upgrade.php
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index 15a5b74a..60d8d895 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,11 +48,14 @@ 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 );
}
- $blogs = $wpdb->get_results( "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
+ $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
if ( empty( $blogs ) ) {
echo '
' . __( 'All done!' ) . '
';
break;
@@ -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.
*
@@ -86,7 +98,7 @@ switch ( $action ) {
}
echo "";
?>
-