Changeset 12451

Timestamp:

12/18/2009 04:54:57 PM (15 years ago)

Author:

ryan

Message:

Hard code required version in update-core.php. see #11464 for 2.9

File:

• branches/2.9/wp-admin/includes/update-core.php (modified) (2 diffs)

branches/2.9/wp-admin/includes/update-core.php

@@ -220 +220 @@
     @set_time_limit( 300 );
 
+    $php_version    = phpversion();
+    $mysql_version  = $wpdb->db_version();
+    $required_php_version = '4.3';
+    $required_mysql_version = '4.1.2';
+    $wp_version = '2.9';
+    $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 ) );
+
     // Sanity check the unzipped distribution
     apply_filters('update_feedback', __('Verifying the unpacked files'));
@@ -228 +243 @@
     }
 
-    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'));