--- a/web/wp-admin/upgrade.php Tue Feb 02 14:45:47 2010 +0000
+++ b/web/wp-admin/upgrade.php Tue Feb 02 15:44:16 2010 +0000
@@ -1,95 +1,108 @@
-<?php
-/**
- * Upgrade WordPress Page.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * We are upgrading WordPress.
- *
- * @since unknown
- * @var bool
- */
-define( 'WP_INSTALLING', true );
-
-/** Load WordPress Bootstrap */
-require( '../wp-load.php' );
-
-timer_start();
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-
-delete_transient('update_core');
-
-if ( isset( $_GET['step'] ) )
- $step = $_GET['step'];
-else
- $step = 0;
-
-// Do it. No output.
-if ( 'upgrade_db' === $step ) {
- wp_upgrade();
- die( '0' );
-}
-
-$step = (int) $step;
-
-@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
-<head>
- <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
- <title><?php _e( 'WordPress › Upgrade' ); ?></title>
- <?php wp_admin_css( 'install', true ); ?>
-</head>
-<body>
-<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
-
-<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
-
-<h2><?php _e( 'No Upgrade Required' ); ?></h2>
-<p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
-<p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
-
-<?php else :
-switch ( $step ) :
- case 0:
- $goback = stripslashes( wp_get_referer() );
- $goback = esc_url_raw( $goback );
- $goback = urlencode( $goback );
-?>
-<h2><?php _e( 'Database Upgrade Required' ); ?></h2>
-<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to upgrade your database to the newest version.' ); ?></p>
-<p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p>
-<p class="step"><a class="button" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Upgrade WordPress Database' ); ?></a></p>
-<?php
- break;
- case 1:
- wp_upgrade();
-
- $backto = empty($_GET['backto']) ? '' : $_GET['backto'] ;
- $backto = stripslashes( urldecode( $backto ) );
- $backto = esc_url_raw( $backto );
- $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
-?>
-<h2><?php _e( 'Upgrade Complete' ); ?></h2>
- <p><?php _e( 'Your WordPress database has been successfully upgraded!' ); ?></p>
- <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
-
-<!--
-<pre>
-<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
-
-<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
-</pre>
--->
-
-<?php
- break;
-endswitch;
-endif;
-?>
-</body>
-</html>
+<?php
+/**
+ * Upgrade WordPress Page.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * We are upgrading WordPress.
+ *
+ * @since unknown
+ * @var bool
+ */
+define( 'WP_INSTALLING', true );
+
+/** Load WordPress Bootstrap */
+require( '../wp-load.php' );
+
+timer_start();
+require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+
+delete_transient('update_core');
+
+if ( isset( $_GET['step'] ) )
+ $step = $_GET['step'];
+else
+ $step = 0;
+
+// Do it. No output.
+if ( 'upgrade_db' === $step ) {
+ wp_upgrade();
+ die( '0' );
+}
+
+$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' ) );
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<head>
+ <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
+ <title><?php _e( 'WordPress › Upgrade' ); ?></title>
+ <?php wp_admin_css( 'install', true ); ?>
+</head>
+<body>
+<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
+
+<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
+
+<h2><?php _e( 'No Upgrade Required' ); ?></h2>
+<p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
+<p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
+
+<?php elseif ( !$php_compat || !$mysql_compat ) :
+ if ( !$mysql_compat && !$php_compat )
+ printf( __('You cannot upgrade 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 )
+ printf( __('You cannot upgrade 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 upgrade because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+?>
+<?php else :
+switch ( $step ) :
+ case 0:
+ $goback = stripslashes( wp_get_referer() );
+ $goback = esc_url_raw( $goback );
+ $goback = urlencode( $goback );
+?>
+<h2><?php _e( 'Database Upgrade Required' ); ?></h2>
+<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to upgrade your database to the newest version.' ); ?></p>
+<p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p>
+<p class="step"><a class="button" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Upgrade WordPress Database' ); ?></a></p>
+<?php
+ break;
+ case 1:
+ wp_upgrade();
+
+ $backto = empty($_GET['backto']) ? '' : $_GET['backto'] ;
+ $backto = stripslashes( urldecode( $backto ) );
+ $backto = esc_url_raw( $backto );
+ $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
+?>
+<h2><?php _e( 'Upgrade Complete' ); ?></h2>
+ <p><?php _e( 'Your WordPress database has been successfully upgraded!' ); ?></p>
+ <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
+
+<!--
+<pre>
+<?php printf( __( '%s queries' ), $wpdb->num_queries ); ?>
+
+<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
+</pre>
+-->
+
+<?php
+ break;
+endswitch;
+endif;
+?>
+</body>
+</html>