diff -r 2f6f6f7551ca -r 32102edaa81b web/wp-admin/upgrade.php
--- a/web/wp-admin/upgrade.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/upgrade.php Mon Nov 19 18:26:13 2012 +0100
@@ -9,7 +9,7 @@
/**
* We are upgrading WordPress.
*
- * @since unknown
+ * @since 1.5.1
* @var bool
*/
define( 'WP_INSTALLING', true );
@@ -20,14 +20,14 @@
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'];
else
$step = 0;
-// Do it. No output.
+// Do it. No output.
if ( 'upgrade_db' === $step ) {
wp_upgrade();
die( '0' );
@@ -38,33 +38,39 @@
$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 ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+ $mysql_compat = true;
+else
+ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
@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 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 );
+ 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 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 );
+ 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 );
?>
-
-
-
-
+
+
+
+
-
-
+
+