<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13681] trunk/wp-admin/ms-upgrade-network.php: Check for empty(),
not !is_array(), when trying to determine if wpdb::get_results()
returned results.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13681">13681</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-12 00:26:31 +0000 (Fri, 12 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check for empty(), not !is_array(), when trying to determine if wpdb::get_results() returned results. See <a href="http://trac.wordpress.org/ticket/10607">#10607</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsupgradenetworkphp">trunk/wp-admin/ms-upgrade-network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsupgradenetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-network.php (13680 => 13681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-network.php 2010-03-12 00:03:44 UTC (rev 13680)
+++ trunk/wp-admin/ms-upgrade-network.php 2010-03-12 00:26:31 UTC (rev 13681)
</span><span class="lines">@@ -29,32 +29,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $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 );
</span><del>- 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' ] );
- }
</del><ins>+ 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' ] );
</ins><span class="cx"> }
</span><del>- 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>';
</del><span class="cx"> }
</span><ins>+ 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
</ins><span class="cx"> break;
</span><span class="cx"> case 'show':
</span><span class="cx"> default:
</span></span></pre>
</div>
</div>
</body>
</html>