From e19a8796fd0bc32790f62a586c24f693766a34a0 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Tue, 2 Feb 2016 00:59:25 +0000 Subject: [PATCH] Database: Allow loading when only the `mysqlnd` extension is loaded. We do an early check for a mysql extension being loaded, but it fails if the `mysqlnd` extension is the only one present. Props nexurium. Fixes #33261. Built from https://develop.svn.wordpress.org/trunk@36434 git-svn-id: http://core.svn.wordpress.org/trunk@36401 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index b1df7fc00c..ec59459f80 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -133,7 +133,7 @@ function wp_check_php_mysql_versions() { die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) ); } - if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) { + if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) { wp_load_translations_early(); $protocol = wp_get_server_protocol(); diff --git a/wp-includes/version.php b/wp-includes/version.php index 9aed5e450a..b6572c0654 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-36433'; +$wp_version = '4.5-alpha-36434'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.