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

WPDB: When attempting to fall back to ext/mysql in db_connect(), return the result of the fall back.

Browse Source 
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
This commit is contained in:
Gary Pendergast 2015-09-24 04:30:25 +00:00
parent 43b7192e8e
commit 1b91141437
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

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

@ -1474,7 +1474,7 @@ class wpdb {
if ( $attempt_fallback ) { if ( $attempt_fallback ) {
$this->use_mysqli = false; $this->use_mysqli = false;
$this->db_connect(); return $this->db_connect( $allow_bail );
} }
} }
} else { } else {