Ticket #14672: 14672.diff

wp-includes/wp-db.php

@@ -476 +476 @@
          * @param string $dbhost MySQL database host
          */
         function wpdb( $dbuser, $dbpassword, $dbname, $dbhost ) {
-                if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB )
-                        $this->db_connect();
                 return $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
         }
 
@@ -502 +500 @@
                 if ( WP_DEBUG )
                         $this->show_errors();
 
-                if ( is_multisite() ) {
+                $this->init_charset();
+
+                $this->dbuser = $dbuser;
+                $this->dbpassword = $dbpassword;
+                $this->dbname = $dbname;
+                $this->dbhost = $dbhost;
+
+                $this->db_connect();
+        }
+
+        /**
+         * PHP5 style destructor and will run when database object is destroyed.
+         *
+         * @see wpdb::__construct()
+         * @since 2.0.8
+         * @return bool true
+         */
+        function __destruct() {
+                return true;
+        }
+
+        /**
+         * Set $this->charset and $this->collate
+         */
+        function init_charset() {
+                if ( function_exists('is_multisite') && is_multisite() ) {
                         $this->charset = 'utf8';
                         if ( defined( 'DB_COLLATE' ) && DB_COLLATE )
                                 $this->collate = DB_COLLATE;
@@ -514 +537 @@
 
                 if ( defined( 'DB_CHARSET' ) )
                         $this->charset = DB_CHARSET;
+        }
 
-                $this->dbuser = $dbuser;
-
-                $this->dbh = @mysql_connect( $dbhost, $dbuser, $dbpassword, true );
-                if ( !$this->dbh ) {
-                        $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
-<h1>Error establishing a database connection</h1>
-<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
-<ul>
-        <li>Are you sure you have the correct username and password?</li>
-        <li>Are you sure that you have typed the correct hostname?</li>
-        <li>Are you sure that the database server is running?</li>
-</ul>
-<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost ), 'db_connect_fail' );
-                        return;
-                }
-
-                $this->ready = true;
-
-                if ( $this->has_cap( 'collation' ) && !empty( $this->charset ) ) {
-                        if ( function_exists( 'mysql_set_charset' ) ) {
-                                mysql_set_charset( $this->charset, $this->dbh );
+        /**
+         * Sets the connection's character set.
+         * 
+         * @param resource $dbh     The resource given by mysql_connect
+         * @param string   $charset The character set (optional)
+         * @param string   $collate The collation (optional)
+         */
+        function set_charset($dbh, $charset = null, $collate = null) {
+                if ( !isset($charset) )
+                        $charset = $this->charset;
+                if ( !isset($collate) )
+                        $collate = $this->collate;
+                if ( $this->has_cap( 'collation', $dbh ) && !empty( $charset ) ) {
+                        if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset', $dbh ) ) {
+                                mysql_set_charset( $charset, $dbh );
                                 $this->real_escape = true;
                         } else {
-                                $query = $this->prepare( 'SET NAMES %s', $this->charset );
-                                if ( ! empty( $this->collate ) )
-                                        $query .= $this->prepare( ' COLLATE %s', $this->collate );
-                                $this->query( $query );
+                                $query = $this->prepare( 'SET NAMES %s', $charset );
+                                if ( ! empty( $collate ) )
+                                        $query .= $this->prepare( ' COLLATE %s', $collate );
+                                mysql_query( $query, $dbh );
                         }
                 }
-
-                $this->select( $dbname, $this->dbh );
         }
 
         /**
-         * PHP5 style destructor and will run when database object is destroyed.
-         *
-         * @see wpdb::__construct()
-         * @since 2.0.8
-         * @return bool true
-         */
-        function __destruct() {
-                return true;
-        }
-
-        /**
          * Sets the table prefix for the WordPress tables.
          *
          * @since 2.5.0
@@ -1017 +1021 @@
                 $this->last_query  = null;
         }
 
+        /**
+         * Figure out which database server should handle a query, and connect to it.
+         * 
+         * @param string query (optional)
+         * @return resource mysql database connection
+         */
         function db_connect( $query = "SELECT" ) {
                 global $db_list, $global_db_list;
-                if ( ! is_array( $db_list ) )
-                        return true;
 
-                if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
-                        $action = 'global';
-                        $details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
-                        $this->db_global = $details;
-                } elseif ( preg_match("/^\\s*(alter table|create|insert|delete|update|replace) /i",$query) ) {
-                        $action = 'write';
-                        $details = $db_list[ 'write' ][ mt_rand( 0, count( $db_list[ 'write' ] ) -1 ) ];
-                        $this->db_write = $details;
+                if ( !defined( 'WP_USE_MULTIPLE_DB' ) || !WP_USE_MULTIPLE_DB ) {
+                        // Single DB mode
+                        $dbhname = 'dbh';
+                        $this->$dbhname = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+                        $dbhost = $this->dbhost;
+                        $dbname = $this->dbname;
                 } else {
-                        $action = '';
-                        $details = $db_list[ 'read' ][ mt_rand( 0, count( $db_list[ 'read' ] ) -1 ) ];
-                        $this->db_read = $details;
+                        // Multiple DB mode
+                        if ( ! is_array( $db_list ) )
+                                return true;
+        
+                        if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i", $query) ) {
+                                $action = 'global';
+                                $details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
+                                $this->db_global = $details;
+                        } elseif ( preg_match("/^\\s*(alter table|create|insert|delete|update|replace) /i", $query) ) {
+                                $action = 'write';
+                                $details = $db_list[ 'write' ][ mt_rand( 0, count( $db_list[ 'write' ] ) -1 ) ];
+                                $this->db_write = $details;
+                        } else {
+                                $action = '';
+                                $details = $db_list[ 'read' ][ mt_rand( 0, count( $db_list[ 'read' ] ) -1 ) ];
+                                $this->db_read = $details;
+                        }
+        
+                        $dbhname = 'dbh' . $action;
+                        $this->$dbhname = @mysql_connect( $details[ 'db_host' ], $details[ 'db_user' ], $details[ 'db_password' ] );
+                        $dbhost = $details[ 'db_host' ];
+                        $dbname = $details[ 'db_name' ];
                 }
 
-                $dbhname = "dbh" . $action;
-                $this->$dbhname = @mysql_connect( $details[ 'db_host' ], $details[ 'db_user' ], $details[ 'db_password' ] );
-                if (!$this->$dbhname ) {
+                if ( !$this->$dbhname ) {
                         $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
 <h1>Error establishing a database connection</h1>
 <p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
@@ -1048 +1071 @@
         <li>Are you sure that the database server is running?</li>
 </ul>
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-"/*/WP_I18N_DB_CONN_ERROR*/, $details['db_host'] ), 'db_connect_fail' );
+"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost ), 'db_connect_fail' );
                 }
-                $this->select( $details[ 'db_name' ], $this->$dbhname );
+
+                $this->set_charset($this->$dbhname);
+
+                $this->ready = true;
+
+                $this->select( $dbname, $this->$dbhname );
         }
 
         /**
@@ -1087 +1115 @@
                 // use $this->dbhglobal for gloal table ops
                 unset( $dbh );
                 if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB ) {
-                        if( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
-                                if( false == isset( $this->dbhglobal ) ) {
+                        if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
+                                if ( !isset( $this->dbhglobal ) )
                                         $this->db_connect( $query );
-                                }
                                 $dbh =& $this->dbhglobal;
                                 $this->last_db_used = "global";
                         } elseif ( preg_match("/^\\s*(alter table|create|insert|delete|update|replace) /i",$query) ) {
-                                if( false == isset( $this->dbhwrite ) ) {
+                                if ( !isset( $this->dbhwrite ) )
                                         $this->db_connect( $query );
-                                }
                                 $dbh =& $this->dbhwrite;
                                 $this->last_db_used = "write";
                         } else {
@@ -1544 +1570 @@
                         case 'group_concat' : // @since 2.7
                         case 'subqueries' :   // @since 2.7
                                 return version_compare( $version, '4.1', '>=' );
+                        case 'set_charset' :
+                                return version_compare($version, '5.0.7', '>=');
                 };
 
                 return false;