diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/network/upgrade.php --- a/wp/wp-admin/network/upgrade.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/network/upgrade.php Mon Oct 14 18:28:13 2019 +0200 @@ -12,22 +12,24 @@ require_once( ABSPATH . WPINC . '/http.php' ); -$title = __( 'Upgrade Network' ); +$title = __( 'Upgrade Network' ); $parent_file = 'upgrade.php'; -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => - '

' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '

' . - '

' . __('If a version update to core has not happened, clicking this button won’t affect anything.') . '

' . - '

' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '

' -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => + '

' . __( 'Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.' ) . '

' . + '

' . __( 'If a version update to core has not happened, clicking this button won’t affect anything.' ) . '

' . + '

' . __( 'If this process fails for any reason, users logging in to their sites will force the same update.' ) . '

', + ) +); get_current_screen()->set_help_sidebar( - '

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

' . - '

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

' . - '

' . __('Support Forums') . '

' + '

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

' . + '

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

' . + '

' . __( 'Support' ) . '

' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); @@ -39,11 +41,11 @@ echo '
'; echo '

' . __( 'Upgrade Network' ) . '

'; -$action = isset($_GET['action']) ? $_GET['action'] : 'show'; +$action = isset( $_GET['action'] ) ? $_GET['action'] : 'show'; switch ( $action ) { - case "upgrade": - $n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0; + case 'upgrade': + $n = ( isset( $_GET['n'] ) ) ? intval( $_GET['n'] ) : 0; if ( $n < 5 ) { /** @@ -53,42 +55,50 @@ update_site_option( 'wpmu_upgrade_site', $wp_db_version ); } - $site_ids = get_sites( array( - 'spam' => 0, - 'deleted' => 0, - 'archived' => 0, - 'network_id' => get_current_network_id(), - 'number' => 5, - 'offset' => $n, - 'fields' => 'ids', - 'order' => 'DESC', - 'orderby' => 'id', - ) ); + $site_ids = get_sites( + array( + 'spam' => 0, + 'deleted' => 0, + 'archived' => 0, + 'network_id' => get_current_network_id(), + 'number' => 5, + 'offset' => $n, + 'fields' => 'ids', + 'order' => 'DESC', + 'orderby' => 'id', + 'update_site_meta_cache' => false, + ) + ); if ( empty( $site_ids ) ) { echo '

' . __( 'All done!' ) . '

'; break; } - echo "'; + ?>

+ + ?>

@@ -136,7 +147,7 @@ * @since MU (3.0.0) */ do_action( 'wpmu_upgrade_page' ); - break; + break; } ?>