Changeset 14058 for trunk/wp-includes/wp-db.php

Timestamp:

04/10/2010 12:39:25 PM (15 years ago)

Author:

nacin

Message:

Some wpdb cleanups.

File:

• trunk/wp-includes/wp-db.php (modified) (11 diffs)

trunk/wp-includes/wp-db.php

@@ -23 +23 @@
  * @since 2.5.0
  */
-define( 'OBJECT_K', 'OBJECT_K', false );
+define( 'OBJECT_K', 'OBJECT_K' );
 
 /**
  * @since 0.71
  */
-define( 'ARRAY_A', 'ARRAY_A', false );
+define( 'ARRAY_A', 'ARRAY_A' );
 
 /**
  * @since 0.71
  */
-define( 'ARRAY_N', 'ARRAY_N', false );
+define( 'ARRAY_N', 'ARRAY_N' );
 
 /**
@@ -579 +579 @@
                 return $old_prefix;
 
-            $this->prefix = $this->get_blog_prefix( $this->blogid );
+            $this->prefix = $this->get_blog_prefix();
 
             foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
@@ -606 +606 @@
         $this->blogid = $blog_id;
 
-        $this->prefix = $this->get_blog_prefix( $this->blogid );
+        $this->prefix = $this->get_blog_prefix();
 
         foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
@@ -625 +625 @@
      * @return string Blog prefix.
      */
-    function get_blog_prefix( $blog_id = -1 ) {
+    function get_blog_prefix( $blog_id = null ) {
         if ( is_multisite() ) {
-            if ( $blog_id < 0 )
+            if ( null === $blog_id )
                 $blog_id = $this->blogid;
             if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
@@ -838 +838 @@
 
     /**
-     * Prepares a SQL query for safe execution.  Uses sprintf()-like syntax.
+     * Prepares a SQL query for safe execution. Uses sprintf()-like syntax.
      *
      * The following directives can be used in the query format string:
@@ -845 +845 @@
      *   %% (literal percentage sign - no argument needed)
      *
-     * 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 %%.
+     * 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 %%.
      *
      * This function only supports a small subset of the sprintf syntax; it only supports %d (decimal number), %s (string).
@@ -1356 +1355 @@
         $new_array = array();
         // Extract the column values
-        for ( $i=0; $i < count( $this->last_result ); $i++ ) {
+        for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
             $new_array[$i] = $this->get_var( null, $x, $i );
         }
@@ -1392 +1391 @@
             foreach ( $this->last_result as $row ) {
                 $key = array_shift( get_object_vars( $row ) );
-                if ( !isset( $new_array[ $key ] ) )
+                if ( ! isset( $new_array[ $key ] ) )
                     $new_array[ $key ] = $row;
             }
@@ -1426 +1425 @@
         if ( $this->col_info ) {
             if ( $col_offset == -1 ) {
-                $i         = 0;
+                $i = 0;
                 $new_array = array();
                 foreach( (array) $this->col_info as $col ) {
@@ -1572 +1571 @@
 }
 
-if ( ! isset($wpdb) ) {
+if ( ! isset( $wpdb ) ) {
     /**
      * WordPress Database Object, if it isn't set already in wp-content/db.php
@@ -1578 +1577 @@
      * @since 0.71
      */
-    $wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
+    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
 }
 ?>