From 0df26215b09bc3e77f088374fb2b4cce761dd681 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Thu, 17 Dec 2009 18:46:19 +0000
Subject: [PATCH] Add required php and mysql versions to version.php.  Future
 proof required version check strings.  Props nacin. see #11464

git-svn-id: https://develop.svn.wordpress.org/trunk@12432 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/update-core.php | 25 +++++++++++++------------
 wp-includes/version.php           | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 28a825ee6c..0da88ca0ad 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -219,18 +219,6 @@ function update_core($from, $to) {
 
 	@set_time_limit( 300 );
 
-	$php_version   = phpversion();
-	$php_compat    = version_compare( $php_version, '4.3', '>=' );
-	$mysql_version = $wpdb->db_version();
-	$mysql_compat  = version_compare( $mysql_version, '4.1.2', '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
-
-	if ( !$mysql_compat && !$php_compat )
-		return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress requires PHP version 4.3 or higher and MySQL version 4.1.2 or higher. You are running PHP version %1$s and MySQL version %2$s.'), $php_version, $mysql_version ) );
-	elseif ( !$php_compat )
-		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress requires PHP version 4.3 or higher. You are running version %s.'), $php_version ) );
-	elseif ( !$mysql_compat )
-		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress requires MySQL version 4.1.2 or higher. You are running version %s.'), $mysql_version ) );
-
 	// Sanity check the unzipped distribution
 	apply_filters('update_feedback', __('Verifying the unpacked files'));
 	if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
@@ -239,6 +227,19 @@ function update_core($from, $to) {
 		return new WP_Error('insane_distro', __('The update could not be unpacked') );
 	}
 
+	include( $from . '/wordpress/wp-includes/version.php' );
+	$php_version    = phpversion();
+	$mysql_version  = $wpdb->db_version();
+	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
+	$mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+
+	if ( !$mysql_compat && !$php_compat )
+		return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
+	elseif ( !$php_compat )
+		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
+	elseif ( !$mysql_compat )
+		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+
 	apply_filters('update_feedback', __('Installing the latest version'));
 
 	// Create maintenance file to signal that we are upgrading
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 74af3c5947..637c9e6701 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -30,3 +30,17 @@ $tinymce_version = '327-1235';
  * @global string $manifest_version
  */
 $manifest_version = '20090616';
+
+/**
+ * Holds the required PHP version
+ *
+ * @global string $required_php_version
+ */
+$required_php_version = '4.3';
+
+/**
+ * Holds the required MySQL version
+ *
+ * @global string $required_mysql_version
+ */
+$required_mysql_version = '4.1.2';
\ No newline at end of file