X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..ef91a7f4f3c6468973e192335a27ec0e0faca0b5:/wp-admin/network/upgrade.php
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index f1574aea..5c2d3f99 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -10,9 +10,6 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! is_multisite() )
- wp_die( __( 'Multisite support is not enabled.' ) );
-
require_once( ABSPATH . WPINC . '/http.php' );
$title = __( 'Upgrade Network' );
@@ -29,17 +26,17 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'
' . __('For more information:') . '
' .
- '' . __('Documentation on Upgrade Network') . '
' .
- '' . __('Support Forums') . '
'
+ '' . __('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.' ), 403 );
+ wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
echo '';
-echo '
' . __( 'Upgrade Network' ) . '
';
+echo '
' . __( 'Upgrade Network' ) . '
';
$action = isset($_GET['action']) ? $_GET['action'] : 'show';
@@ -48,25 +45,42 @@ 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 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 ) ) {
+ $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',
+ ) );
+ if ( empty( $site_ids ) ) {
echo '
' . __( 'All done!' ) . '
';
break;
}
echo "
";
- foreach ( (array) $blogs as $details ) {
- switch_to_blog( $details['blog_id'] );
+ foreach ( (array) $site_ids as $site_id ) {
+ switch_to_blog( $site_id );
$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' ) );
+ $response = wp_remote_get( $upgrade_url, array(
+ 'timeout' => 120,
+ 'httpversion' => '1.1',
+ 'sslverify' => false,
+ ) );
if ( is_wp_error( $response ) ) {
wp_die( sprintf(
/* translators: 1: site url, 2: server error message */
@@ -89,9 +103,9 @@ switch ( $action ) {
*
* @since MU
*
- * @param int $blog_id The id of the blog.
+ * @param int $site_id The Site ID.
*/
- do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
+ do_action( 'wpmu_upgrade_site', $site_id );
}
echo "
";
?>
@@ -108,12 +122,12 @@ switch ( $action ) {
default:
if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
?>
-
+
-
-
+
+