WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WPDB: HHVM doesn't support passing a DB link to `mysqli_get_client_version()`. While we usually pass a DB link to every `ext/mysql` and `mysqli` function call, we don't really need to do that here, as there's no way for the client library to change mid page load. 

Another fun fact is that `mysql_get_client_version()` doesn't exist, but `mysql_get_client_info()` (along with `mysqli_get_client_info()') do. So, we're switching to them, in order to add a pleasing symmetry to the client version check.

Fixes #31644


Built from https://develop.svn.wordpress.org/trunk@31783


git-svn-id: http://core.svn.wordpress.org/trunk@31763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-03-15 12:20:26 +00:00
parent 33c785e021
commit 8c7ffba3b2
2 changed files with 5 additions and 3 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
*/
$wp_version = '4.2-beta1-31782';
$wp_version = '4.2-beta1-31783';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

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

@ -2805,10 +2805,12 @@ class wpdb {
return false;
}
if ( $this->use_mysqli ) {
return mysqli_get_client_version( $this->dbh ) >= 50503;
$client_version = mysqli_get_client_info();
} else {
return mysql_get_client_version( $this->dbh ) >= 50503;
$client_version = mysql_get_client_info();
}
return version_compare( $client_version, '5.5.3', '>=' );
}
return false;