mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
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. Fixes #42812 for trunk. Built from https://develop.svn.wordpress.org/trunk@42388 git-svn-id: http://core.svn.wordpress.org/trunk@42217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
6322887487
commit
04efa7e7ea
@ -4,7 +4,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '5.0-alpha-42387';
|
||||
$wp_version = '5.0-alpha-42388';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
@ -593,19 +593,12 @@ class wpdb {
|
||||
$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;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user