Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Rename USE_EXT_MYSQL to WP_USE_EXT_MYSQL. see #21663.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@28022


git-svn-id: http://core.svn.wordpress.org/trunk@27852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-04-07 22:27:15 +00:00
parent 68298460d4
commit 1860b6a007
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/wp-db.php
View File

@ -579,14 +579,14 @@ class wpdb {
$this->show_errors(); $this->show_errors();
/* Use ext/mysqli if it exists and: /* Use ext/mysqli if it exists and:
* - USE_EXT_MYSQL is defined as false, or * - WP_USE_EXT_MYSQL is defined as false, or
* - We are a development version of WordPress, or * - We are a development version of WordPress, or
* - We are running PHP 5.5 or greater, or * - We are running PHP 5.5 or greater, or
* - ext/mysql is not loaded. * - ext/mysql is not loaded.
*/ */
if ( function_exists( 'mysqli_connect' ) ) { if ( function_exists( 'mysqli_connect' ) ) {
if ( defined( 'USE_EXT_MYSQL' ) ) { if ( defined( 'WP_USE_EXT_MYSQL' ) ) {
$this->use_mysqli = ! USE_EXT_MYSQL; $this->use_mysqli = ! WP_USE_EXT_MYSQL;
} elseif ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) { } elseif ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) {
$this->use_mysqli = true; $this->use_mysqli = true;
} elseif ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) { } elseif ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
@ -1349,14 +1349,14 @@ class wpdb {
/* It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if: /* It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if:
* - We haven't previously connected, and * - We haven't previously connected, and
* - USE_EXT_MYSQL isn't set to false, and * - WP_USE_EXT_MYSQL isn't set to false, and
* - ext/mysql is loaded. * - ext/mysql is loaded.
*/ */
$attempt_fallback = true; $attempt_fallback = true;
if ( $this->has_connected ) { if ( $this->has_connected ) {
$attempt_fallback = false; $attempt_fallback = false;
} else if ( defined( 'USE_EXT_MYSQL' ) && ! USE_EXT_MYSQL ) { } else if ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
$attempt_fallback = false; $attempt_fallback = false;
} else if ( ! function_exists( 'mysql_connect' ) ) { } else if ( ! function_exists( 'mysql_connect' ) ) {
$attempt_fallback = false; $attempt_fallback = false;