X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/af50974463450c98503e763a7836a50e260461a9..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-admin/network/upgrade.php diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php index dcca3deb..f1574aea 100644 --- a/wp-admin/network/upgrade.php +++ b/wp-admin/network/upgrade.php @@ -29,14 +29,14 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '

' . __('For more information:') . '

' . - '

' . __('Documentation on Upgrade Network') . '

' . + '

' . __('Documentation on Upgrade Network') . '

' . '

' . __('Support Forums') . '

' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( ! current_user_can( 'manage_network' ) ) - wp_die( __( 'You do not have permission to access this page.' ) ); + wp_die( __( 'You do not have permission to access this page.' ), 403 ); echo '
'; echo '

' . __( 'Upgrade Network' ) . '

'; @@ -63,10 +63,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. *