Changes from trunk/wp-includes/wp-db.php at r18350 to branches/3.1/wp-includes/wp-db.php at r18357

File:

• branches/3.1/wp-includes/wp-db.php (modified) (5 diffs)

branches/3.1/wp-includes/wp-db.php

@@ -40 +40 @@
  * It is possible to replace this class with your own
  * by setting the $wpdb global variable in wp-content/db.php
- * file to your class. The wpdb class will still be included,
- * so you can extend it or simply use your own.
+ * file with your class. You can name it wpdb also, since
+ * this file will not be included, if the other file is
+ * available.
  *
  * @link http://codex.wordpress.org/Function_Reference/wpdb_Class
@@ -460 +461 @@
      */
     var $func_call;
+
+    /**
+     * Connects to the database server and selects a database
+     *
+     * PHP4 compatibility layer for calling the PHP5 constructor.
+     *
+     * @uses wpdb::__construct() Passes parameters and returns result
+     * @since 0.71
+     *
+     * @param string $dbuser MySQL database user
+     * @param string $dbpassword MySQL database password
+     * @param string $dbname MySQL database name
+     * @param string $dbhost MySQL database host
+     */
+    function wpdb( $dbuser, $dbpassword, $dbname, $dbhost ) {
+        return $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
+    }
 
     /**
@@ -1014 +1032 @@
      */
     function db_connect() {
+        global $db_list, $global_db_list;
+
         if ( WP_DEBUG ) {
             $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
@@ -1084 +1104 @@
         }
 
-        if ( preg_match( '/^\s*(create|alter|truncate|drop) /i', $query ) ) {
-            $return_val = $this->result;
-        } elseif ( preg_match( '/^\s*(insert|delete|update|replace) /i', $query ) ) {
+        if ( preg_match( "/^\\s*(insert|delete|update|replace|alter) /i", $query ) ) {
             $this->rows_affected = mysql_affected_rows( $this->dbh );
             // Take note of the insert_id
-            if ( preg_match( '/^\s*(insert|replace) /i', $query ) ) {
+            if ( preg_match( "/^\\s*(insert|replace) /i", $query ) ) {
                 $this->insert_id = mysql_insert_id($this->dbh);
             }
@@ -1367 +1385 @@
             // (Duplicates are discarded)
             foreach ( $this->last_result as $row ) {
-                $key = array_shift( get_object_vars( $row ) );
+                $key = array_shift( $var_by_ref = get_object_vars( $row ) );
                 if ( ! isset( $new_array[ $key ] ) )
                     $new_array[ $key ] = $row;