Changeset 38680

Timestamp:

09/30/2016 03:50:18 AM (10 years ago)

Author:

jeremyfelt

Message:

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.

File:

• trunk/src/wp-admin/network/upgrade.php (modified) (2 diffs)

trunk/src/wp-admin/network/upgrade.php

@@ -53 +53 @@
                 }
 
-                $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' );
@@ -94 +104 @@
                          * @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>";