Use new $required_mysql_version global in wp-db.php when checking if the mysql version is new enough. Fixes #11478 props nacin.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
acd41194ff
commit
736315e0d5
|
@ -1044,15 +1044,16 @@ class wpdb {
|
||||||
*
|
*
|
||||||
* @since 2.5.0
|
* @since 2.5.0
|
||||||
* @uses $wp_version
|
* @uses $wp_version
|
||||||
|
* @uses $required_mysql_version
|
||||||
*
|
*
|
||||||
* @return WP_Error
|
* @return WP_Error
|
||||||
*/
|
*/
|
||||||
function check_database_version()
|
function check_database_version()
|
||||||
{
|
{
|
||||||
global $wp_version;
|
global $wp_version, $required_mysql_version;
|
||||||
// Make sure the server has MySQL 4.1.2
|
// Make sure the server has the required MySQL version
|
||||||
if ( version_compare($this->db_version(), '4.1.2', '<') )
|
if ( version_compare($this->db_version(), $required_mysql_version, '<') )
|
||||||
return new WP_Error('database_version',sprintf(__('<strong>ERROR</strong>: WordPress %s requires MySQL 4.1.2 or higher'), $wp_version));
|
return new WP_Error('database_version',sprintf(__('<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher'), $wp_version, $required_mysql_version));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue