Changeset 6701

Timestamp:

01/31/2008 10:09:17 PM (19 years ago)

Author:

ryan

Message:

Allow multiple db instances. Props Nazgul. fixes #2722

File:

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

trunk/wp-includes/wp-db.php

@@ -65 +65 @@
                         $this->collate = DB_COLLATE;
 
-                $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
+                $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword, true);
                 if (!$this->dbh) {
                         $this->bail("
@@ -82 +82 @@
                 $this->ready = true;
 
-                if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+                if ( !empty($this->charset) && version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') )
                         $this->query("SET NAMES '$this->charset'");
 
@@ -494 +494 @@
                 global $wp_version;
                 // Make sure the server has MySQL 4.0
-                $mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info());
+                $mysql_version = preg_replace('|[^0-9\.]|', '', @mysql_get_server_info($this->dbh));
                 if ( version_compare($mysql_version, '4.0.0', '<') )
                         return new WP_Error('database_version',sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
@@ -505 +505 @@
         function supports_collation()
         {
-                return ( version_compare(mysql_get_server_info(), '4.1.0', '>=') );
+                return ( version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') );
         }