From 0dc18d3ffbfd073e8aebdea14b8b4ad1375b74d7 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Fri, 30 Sep 2016 03:51:30 +0000
Subject: [PATCH] Multisite: Use `get_sites()` in network upgrade.

Use `get_sites()` to generate the same query that was previously performed manually.

Props spacedmonkey, flixos90.
Fixes #37823.

Built from https://develop.svn.wordpress.org/trunk@38680


git-svn-id: http://core.svn.wordpress.org/trunk@38623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/upgrade.php | 22 ++++++++++++++++------
 wp-includes/version.php      |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index f184a8c3e6..b2001e1364 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -52,14 +52,24 @@ switch ( $action ) {
 			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 blog_id 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 '<p>' . __( 'All done!' ) . '</p>';
 			break;
 		}
 		echo "<ul>";
-		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();
@@ -93,9 +103,9 @@ switch ( $action ) {
 			 *
 			 * @since MU
 			 *
-			 * @param int $blog_id The Site ID.
+			 * @param int $site_id The Site ID.
 			 */
-			do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
+			do_action( 'wpmu_upgrade_site', $site_id );
 		}
 		echo "</ul>";
 		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9a64f14d57..fa0682d3fb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38679';
+$wp_version = '4.7-alpha-38680';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.