Changeset 28022

Timestamp:

04/07/2014 10:26:19 PM (13 years ago)

Author:

nacin

Message:

Rename USE_EXT_MYSQL to WP_USE_EXT_MYSQL. see #21663.

File:

• trunk/src/wp-includes/wp-db.php (modified) (4 diffs)

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

@@ -580 +580 @@
 
                 /* 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 running PHP 5.5 or greater, or
@@ -586 +586 @@
                  */
                 if ( function_exists( 'mysqli_connect' ) ) {
-                        if ( defined( 'USE_EXT_MYSQL' ) ) {
-                                $this->use_mysqli = ! USE_EXT_MYSQL;
+                        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;
@@ -1350 +1350 @@
                                 /* It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if:
                                  *  - 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.
                                  */
@@ -1357 +1357 @@
                                 if ( $this->has_connected ) {
                                         $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;
                                 } else if ( ! function_exists( 'mysql_connect' ) ) {