<!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>[14058] trunk/wp-includes/wp-db.php: Some wpdb cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14058">14058</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-10 12:39:25 +0000 (Sat, 10 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some wpdb cleanups.</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 (14057 => 14058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-04-10 12:39:01 UTC (rev 14057)
+++ trunk/wp-includes/wp-db.php 2010-04-10 12:39:25 UTC (rev 14058)
</span><span class="lines">@@ -22,17 +22,17 @@
</span><span class="cx"> /**
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> */
</span><del>-define( 'OBJECT_K', 'OBJECT_K', false );
</del><ins>+define( 'OBJECT_K', 'OBJECT_K' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @since 0.71
</span><span class="cx"> */
</span><del>-define( 'ARRAY_A', 'ARRAY_A', false );
</del><ins>+define( 'ARRAY_A', 'ARRAY_A' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @since 0.71
</span><span class="cx"> */
</span><del>-define( 'ARRAY_N', 'ARRAY_N', false );
</del><ins>+define( 'ARRAY_N', 'ARRAY_N' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Database Access Abstraction Object
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> if ( defined( 'VHOST' ) && empty( $this->blogid ) )
</span><span class="cx"> return $old_prefix;
</span><span class="cx">
</span><del>- $this->prefix = $this->get_blog_prefix( $this->blogid );
</del><ins>+ $this->prefix = $this->get_blog_prefix();
</ins><span class="cx">
</span><span class="cx"> foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
</span><span class="cx"> $this->$table = $prefixed_table;
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> $old_blog_id = $this->blogid;
</span><span class="cx"> $this->blogid = $blog_id;
</span><span class="cx">
</span><del>- $this->prefix = $this->get_blog_prefix( $this->blogid );
</del><ins>+ $this->prefix = $this->get_blog_prefix();
</ins><span class="cx">
</span><span class="cx"> foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
</span><span class="cx"> $this->$table = $prefixed_table;
</span><span class="lines">@@ -624,9 +624,9 @@
</span><span class="cx"> * @param int $blog_id Optional.
</span><span class="cx"> * @return string Blog prefix.
</span><span class="cx"> */
</span><del>- function get_blog_prefix( $blog_id = -1 ) {
</del><ins>+ function get_blog_prefix( $blog_id = null ) {
</ins><span class="cx"> if ( is_multisite() ) {
</span><del>- if ( $blog_id < 0 )
</del><ins>+ if ( null === $blog_id )
</ins><span class="cx"> $blog_id = $this->blogid;
</span><span class="cx"> if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
</span><span class="cx"> return $this->base_prefix;
</span><span class="lines">@@ -837,16 +837,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Prepares a SQL query for safe execution. Uses sprintf()-like syntax.
</del><ins>+ * Prepares a SQL query for safe execution. Uses sprintf()-like syntax.
</ins><span class="cx"> *
</span><span class="cx"> * The following directives can be used in the query format string:
</span><span class="cx"> * %d (decimal number)
</span><span class="cx"> * %s (string)
</span><span class="cx"> * %% (literal percentage sign - no argument needed)
</span><span class="cx"> *
</span><del>- * Both %d and %s are to be left unquoted in the query string and
- * they need an argument passed for them. Literals (%) as parts of
- * the query must be properly written as %%.
</del><ins>+ * Both %d and %s are to be left unquoted in the query string and they need an argument passed for them.
+ * Literals (%) as parts of the query must be properly written as %%.
</ins><span class="cx"> *
</span><span class="cx"> * This function only supports a small subset of the sprintf syntax; it only supports %d (decimal number), %s (string).
</span><span class="cx"> * Does not support sign, padding, alignment, width or precision specifiers.
</span><span class="lines">@@ -1355,7 +1354,7 @@
</span><span class="cx">
</span><span class="cx"> $new_array = array();
</span><span class="cx"> // Extract the column values
</span><del>- for ( $i=0; $i < count( $this->last_result ); $i++ ) {
</del><ins>+ for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
</ins><span class="cx"> $new_array[$i] = $this->get_var( null, $x, $i );
</span><span class="cx"> }
</span><span class="cx"> return $new_array;
</span><span class="lines">@@ -1391,7 +1390,7 @@
</span><span class="cx"> // (Duplicates are discarded)
</span><span class="cx"> foreach ( $this->last_result as $row ) {
</span><span class="cx"> $key = array_shift( get_object_vars( $row ) );
</span><del>- if ( !isset( $new_array[ $key ] ) )
</del><ins>+ if ( ! isset( $new_array[ $key ] ) )
</ins><span class="cx"> $new_array[ $key ] = $row;
</span><span class="cx"> }
</span><span class="cx"> return $new_array;
</span><span class="lines">@@ -1425,7 +1424,7 @@
</span><span class="cx"> function get_col_info( $info_type = 'name', $col_offset = -1 ) {
</span><span class="cx"> if ( $this->col_info ) {
</span><span class="cx"> if ( $col_offset == -1 ) {
</span><del>- $i = 0;
</del><ins>+ $i = 0;
</ins><span class="cx"> $new_array = array();
</span><span class="cx"> foreach( (array) $this->col_info as $col ) {
</span><span class="cx"> $new_array[$i] = $col->{$info_type};
</span><span class="lines">@@ -1571,12 +1570,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( ! isset($wpdb) ) {
</del><ins>+if ( ! isset( $wpdb ) ) {
</ins><span class="cx"> /**
</span><span class="cx"> * WordPress Database Object, if it isn't set already in wp-content/db.php
</span><span class="cx"> * @global object $wpdb Creates a new wpdb object based on wp-config.php Constants for the database
</span><span class="cx"> * @since 0.71
</span><span class="cx"> */
</span><del>- $wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
</del><ins>+ $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>