From f1241d5e6c10b29bc19582f1bfdea0a532e9afaa Mon Sep 17 00:00:00 2001 From: Peter Westwood Date: Tue, 22 Dec 2009 11:49:22 +0000 Subject: [PATCH] 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: https://develop.svn.wordpress.org/trunk@12480 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/wp-db.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index d2f79a6399..8f136ad54d 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1044,15 +1044,16 @@ class wpdb { * * @since 2.5.0 * @uses $wp_version + * @uses $required_mysql_version * * @return WP_Error */ function check_database_version() { - global $wp_version; - // Make sure the server has MySQL 4.1.2 - if ( version_compare($this->db_version(), '4.1.2', '<') ) - return new WP_Error('database_version',sprintf(__('ERROR: WordPress %s requires MySQL 4.1.2 or higher'), $wp_version)); + global $wp_version, $required_mysql_version; + // Make sure the server has the required MySQL version + if ( version_compare($this->db_version(), $required_mysql_version, '<') ) + return new WP_Error('database_version',sprintf(__('ERROR: WordPress %1$s requires MySQL %2$s or higher'), $wp_version, $required_mysql_version)); } /**