X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/98a4d31e52bd56c908617df281730bd4ba58d110..refs/tags/wordpress-3.1.1:/wp-admin/upgrade.php
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 7c093d1c..794b55b6 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -9,7 +9,7 @@
/**
* We are upgrading WordPress.
*
- * @since unknown
+ * @since 1.5.1
* @var bool
*/
define( 'WP_INSTALLING', true );
@@ -20,7 +20,7 @@ require( '../wp-load.php' );
timer_start();
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-delete_transient('update_core');
+delete_site_transient('update_core');
if ( isset( $_GET['step'] ) )
$step = $_GET['step'];
@@ -35,24 +35,40 @@ if ( 'upgrade_db' === $step ) {
$step = (int) $step;
+$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' );
+
@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
?>
>
- <?php _e( 'WordPress › Upgrade' ); ?>
-
+ <?php _e( 'WordPress › Update' ); ?>
+
-
+
+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 )
+ printf( __('You cannot update 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 )
+ printf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+?>
-
-
-
-
+
+
+
+
-
-
+
+