WordPress.org

Make WordPress Core

Changeset 28022


Ignore:
Timestamp:
04/07/2014 10:26:19 PM (4 years ago)
Author:
nacin
Message:

Rename USE_EXT_MYSQL to WP_USE_EXT_MYSQL. see #21663.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/wp-db.php

    r28016 r28022  
    580580
    581581        /* Use ext/mysqli if it exists and:
    582          *  - USE_EXT_MYSQL is defined as false, or
     582         *  - WP_USE_EXT_MYSQL is defined as false, or
    583583         *  - We are a development version of WordPress, or
    584584         *  - We are running PHP 5.5 or greater, or
     
    586586         */
    587587        if ( function_exists( 'mysqli_connect' ) ) {
    588             if ( defined( 'USE_EXT_MYSQL' ) ) {
    589                 $this->use_mysqli = ! USE_EXT_MYSQL;
     588            if ( defined( 'WP_USE_EXT_MYSQL' ) ) {
     589                $this->use_mysqli = ! WP_USE_EXT_MYSQL;
    590590            } elseif ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) {
    591591                $this->use_mysqli = true;
     
    13501350                /* It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if:
    13511351                 *  - We haven't previously connected, and
    1352                  *  - USE_EXT_MYSQL isn't set to false, and
     1352                 *  - WP_USE_EXT_MYSQL isn't set to false, and
    13531353                 *  - ext/mysql is loaded.
    13541354                 */
     
    13571357                if ( $this->has_connected ) {
    13581358                    $attempt_fallback = false;
    1359                 } else if ( defined( 'USE_EXT_MYSQL' ) && ! USE_EXT_MYSQL ) {
     1359                } else if ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
    13601360                    $attempt_fallback = false;
    13611361                } else if ( ! function_exists( 'mysql_connect' ) ) {
Note: See TracChangeset for help on using the changeset viewer.