Changeset 42455

Timestamp:

01/15/2018 10:49:15 PM (7 years ago)

Author:

SergeyBiryukov

Message:

WPDB: Always use mysqli when available.

This change makes WordPress use mysqli on PHP <5.5 when available, instead of only in PHP 5.5+ and development installs.

WPDB includes a fallback to mysql in the event that the database connection fails with mysqli so incompatibilities should be few and far between.

Props dd32.
Merges [42388] to the 4.9 branch.
Fixes #42812.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)

branches/4.9/src/wp-includes/wp-db.php

@@ -571 +571 @@
             $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;
             }
         }