From 9492517abd5ffffa0a8bf1eca9b0bd2c955e8484 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
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: http://svn.automattic.com/wordpress/trunk@13681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 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 f2de8c595..059823342 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 "<ul>";
-			foreach ( (array) $blogs as $details ) {
-				if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
-					$siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
-					echo "<li>$siteurl</li>";
-					$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( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
-					do_action( 'after_mu_upgrade', $response );
-					do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
-				}
-			}
-			echo "</ul>";
-			?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
-			<script type='text/javascript'>
-			<!--
-			function nextpage() {
-				location.href = "ms-upgrade-network.php?action=upgrade&n=<?php echo ($n + 5) ?>";
-			}
-			setTimeout( "nextpage()", 250 );
-			//-->
-			</script><?php
-		} else {
-			echo '<p>'.__('All Done!').'</p>';
+		if ( empty( $blogs ) ) {
+			echo '<p>' . __( 'All done!' ) . '</p>';
+			break;
 		}
+		echo "<ul>";
+		foreach ( (array) $blogs as $details ) {
+			if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
+				$siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
+				echo "<li>$siteurl</li>";
+				$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( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
+				do_action( 'after_mu_upgrade', $response );
+				do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
+			}
+		}
+		echo "</ul>";
+		?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
+		<script type='text/javascript'>
+		<!--
+		function nextpage() {
+			location.href = "ms-upgrade-network.php?action=upgrade&n=<?php echo ($n + 5) ?>";
+		}
+		setTimeout( "nextpage()", 250 );
+		//-->
+		</script><?php
 	break;
 	case 'show':
 	default: