golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2010-03-12 00:26:31 +00:00
parent 03eac5614c
commit 9492517abd
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/ms-upgrade-network.php
View File

@ -29,7 +29,10 @@ 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 ) ) {
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 ) {
@ -52,9 +55,6 @@ switch ( $action ) {
setTimeout( "nextpage()", 250 );
//-->
</script><?php
} else {
echo '<p>'.__('All Done!').'</p>';
}
break;
case 'show':
default: