From f367a78cb7107c15704136a2d95ebebe8a1e029f Mon Sep 17 00:00:00 2001
From: Andrew Nacin
Date: Fri, 12 Mar 2010 00:26:31 +0000
Subject: [PATCH] Check for empty(), not !is_array(), when trying to determine
if wpdb::get_results() returned results. See #10607
git-svn-id: https://develop.svn.wordpress.org/trunk@13681 602fd350-edb4-49c9-b593-d223f7449a82
---
wp-admin/ms-upgrade-network.php | 50 ++++++++++++++++-----------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/wp-admin/ms-upgrade-network.php b/wp-admin/ms-upgrade-network.php
index f2de8c595e..0598233428 100644
--- a/wp-admin/ms-upgrade-network.php
+++ b/wp-admin/ms-upgrade-network.php
@@ -29,32 +29,32 @@ switch ( $action ) {
}
$blogs = $wpdb->get_results( "SELECT * 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 ( is_array( $blogs ) ) {
- echo "";
- foreach ( (array) $blogs as $details ) {
- if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
- $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
- echo "- $siteurl
";
- $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
- if ( is_wp_error( $response ) )
- wp_die( "Warning! Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.
Error message: " . $response->get_error_message() ."" );
- do_action( 'after_mu_upgrade', $response );
- do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
- }
- }
- echo "
";
- ?>
- '.__('All Done!').'
';
+ if ( empty( $blogs ) ) {
+ echo '' . __( 'All done!' ) . '
';
+ break;
}
+ echo "";
+ foreach ( (array) $blogs as $details ) {
+ if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
+ $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
+ echo "- $siteurl
";
+ $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+ if ( is_wp_error( $response ) )
+ wp_die( "Warning! Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.
Error message: " . $response->get_error_message() ."" );
+ do_action( 'after_mu_upgrade', $response );
+ do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
+ }
+ }
+ echo "
";
+ ?>
+