Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-11 02:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Allow multiple db instances. Props Nazgul. fixes #2722

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@6701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-01-31 22:09:17 +00:00
parent 7db4c0ad2c
commit 08a89b8a11
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/wp-db.php
View File

@ -64,7 +64,7 @@ class wpdb {
if ( defined('DB_COLLATE') ) if ( defined('DB_COLLATE') )
$this->collate = DB_COLLATE; $this->collate = DB_COLLATE;
$this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword); $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword, true);
if (!$this->dbh) { if (!$this->dbh) {
$this->bail(" $this->bail("
<h1>Error establishing a database connection</h1> <h1>Error establishing a database connection</h1>
@ -81,7 +81,7 @@ class wpdb {
$this->ready = true; $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'"); $this->query("SET NAMES '$this->charset'");
$this->select($dbname); $this->select($dbname);
@ -493,7 +493,7 @@ class wpdb {
{ {
global $wp_version; global $wp_version;
// Make sure the server has MySQL 4.0 // 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', '<') ) 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)); return new WP_Error('database_version',sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.0.0 or higher'), $wp_version));
} }
@ -504,7 +504,7 @@ class wpdb {
*/ */
function supports_collation() 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', '>=') );
} }
/** /**