From 1b911414372e1074028288e924d4437b730839d3 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Thu, 24 Sep 2015 04:30:25 +0000 Subject: [PATCH] WPDB: When attempting to fall back to `ext/mysql` in `db_connect()`, return the result of the fall back. While it doesn't affect Core, we should also be passing the `$allow_bail` parameter, for anything that uses it differently. Props markoheijnen, johnbillion. Fixes #33105. Built from https://develop.svn.wordpress.org/trunk@34478 git-svn-id: http://core.svn.wordpress.org/trunk@34442 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 84a77bb5f7..ce6f0ecbc6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34477'; +$wp_version = '4.4-alpha-34478'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index c745cb2430..8e151e8c98 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1474,7 +1474,7 @@ class wpdb { if ( $attempt_fallback ) { $this->use_mysqli = false; - $this->db_connect(); + return $this->db_connect( $allow_bail ); } } } else {