Changeset 27257

Timestamp:

02/25/2014 03:52:48 PM (11 years ago)

Author:

nacin

Message:

Use mysqli for WordPress development versions, regardless of PHP version, to increase testing footprint.

Allow the lack of ext/mysql to pass wp_check_php_mysql_versions().

see #21663.

Location:

trunk/src/wp-includes

Files:

• load.php (modified) (1 diff)
• wp-db.php (modified) (1 diff)

trunk/src/wp-includes/load.php

@@ -108 +108 @@
     }
 
-    if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+    if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
         wp_load_translations_early();
         die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );

trunk/src/wp-includes/wp-db.php

@@ -569 +569 @@
             $this->show_errors();
 
-        $this->use_mysqli = ( version_compare( phpversion(), '5.5', '>=' ) && function_exists( 'mysqli_connect' ) );
+        /* Use ext/mysqli if it exists and:
+         *  - We are a development version of WordPress, or
+         *  - We are running PHP 5.5 or greater, or
+         *  - ext/mysql is not loaded.
+         */
+        if ( function_exists( 'mysqli_connect' ) ) {
+            if ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) {
+                $this->use_mysqli = true;
+            } elseif ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+                $this->use_mysqli = true;
+            }
+        }
 
         $this->init_charset();