<!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>[13671] trunk/wp-includes/wp-db.php: Ensure that wpdb::get_results()
always returns an array when it should.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13671">13671</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-03-11 21:30:29 +0000 (Thu, 11 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that wpdb::get_results() always returns an array when it should. Fixes <a href="http://trac.wordpress.org/ticket/10607">#10607</a> props miqrogroove.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (13670 => 13671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-03-11 20:45:24 UTC (rev 13670)
+++ trunk/wp-includes/wp-db.php 2010-03-11 21:30:29 UTC (rev 13671)
</span><span class="lines">@@ -445,6 +445,15 @@
</span><span class="cx"> var $dbuser;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * A textual description of the last query/get_row/get_var call
+ *
+ * @since unknown
+ * @access public
+ * @var string
+ */
+ var $func_call;
+
+ /**
</ins><span class="cx"> * Connects to the database server and selects a database
</span><span class="cx"> *
</span><span class="cx"> * PHP4 compatibility layer for calling the PHP5 constructor.
</span><span class="lines">@@ -1387,20 +1396,19 @@
</span><span class="cx"> } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
</span><span class="cx"> // Return an integer-keyed array of...
</span><span class="cx"> if ( $this->last_result ) {
</span><del>- $i = 0;
</del><span class="cx"> foreach( (array) $this->last_result as $row ) {
</span><span class="cx"> if ( $output == ARRAY_N ) {
</span><span class="cx"> // ...integer-keyed row arrays
</span><del>- $new_array[$i] = array_values( get_object_vars( $row ) );
</del><ins>+ $new_array[] = array_values( get_object_vars( $row ) );
</ins><span class="cx"> } else {
</span><span class="cx"> // ...column name-keyed row arrays
</span><del>- $new_array[$i] = get_object_vars( $row );
</del><ins>+ $new_array[] = get_object_vars( $row );
</ins><span class="cx"> }
</span><del>- ++$i;
</del><span class="cx"> }
</span><del>- return $new_array;
</del><span class="cx"> }
</span><ins>+ return $new_array;
</ins><span class="cx"> }
</span><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1569,4 +1577,4 @@
</span><span class="cx"> */
</span><span class="cx"> $wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
</span><span class="cx"> }
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>