Ticket #42812: 42812.diff

src/wp-includes/wp-db.php

@@ -581 +581 @@
          *
          * @global string $wp_version
          *
          * @param string $dbuser     MySQL database user
          * @param string $dbpassword MySQL database password
          * @param string $dbname     MySQL database name
          * @param string $dbhost     MySQL database host
          */
         public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
                 register_shutdown_function( array( $this, '__destruct' ) );
 
                 if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
                         $this->show_errors();
                 }
 
-                /* Use ext/mysqli if it exists and:
-                 *  - WP_USE_EXT_MYSQL is defined as false, or
-                 *  - We are a development version of WordPress, or
-                 *  - We are running PHP 5.5 or greater, or
-                 *  - ext/mysql is not loaded.
-                 */
+                // Use ext/mysqli if it exists unless WP_USE_EXT_MYSQL is defined as true
                 if ( function_exists( 'mysqli_connect' ) ) {
+                        $this->use_mysqli = true;
+
                         if ( defined( 'WP_USE_EXT_MYSQL' ) ) {
                                 $this->use_mysqli = ! WP_USE_EXT_MYSQL;
-                        } elseif ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) {
-                                $this->use_mysqli = true;
-                        } elseif ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
-                                $this->use_mysqli = true;
                         }
                 }
 
                 $this->dbuser     = $dbuser;
                 $this->dbpassword = $dbpassword;
                 $this->dbname     = $dbname;
                 $this->dbhost     = $dbhost;
 
                 // wp-config.php creation will manually connect when ready.
                 if ( defined( 'WP_SETUP_CONFIG' ) ) {
                         return;
                 }
 
                 $this->db_connect();
         }