<?php
-define('WP_INSTALLING', true);
+/**
+ * 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' );
-require('../wp-load.php');
timer_start();
-require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+
+delete_transient('update_core');
-if (isset($_GET['step']))
- $step = (int) $_GET['step'];
+if ( isset( $_GET['step'] ) )
+ $step = $_GET['step'];
else
$step = 0;
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+
+// 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>
+ <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 ) : ?>
+<?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>
+<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) :
+switch ( $step ) :
case 0:
- $goback = stripslashes(wp_get_referer());
- $goback = clean_url($goback, null, 'url');
- $goback = urlencode($goback);
+ $goback = stripslashes( wp_get_referer() );
+ $goback = esc_url_raw( $goback );
+ $goback = urlencode( $goback );
?>
-<h2><?php _e('Database Upgrade Required'); ?></h2>
-<p><?php _e('Your WordPress database is out-of-date, and must be upgraded before you can continue.'); ?></p>
-<p><?php _e('The upgrade process may take a 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'); ?></a></p>
+<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();
- if ( empty( $_GET['backto'] ) )
- $backto = __get_option('home') . '/';
- else {
- $backto = stripslashes(urldecode($_GET['backto']));
- $backto = clean_url($backto, null, 'url');
- }
+ $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>
+<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 queries' ), $wpdb->num_queries ); ?>
-<?php printf(__('%s seconds'), timer_stop(0)); ?>
+<?php printf( __( '%s seconds' ), timer_stop( 0 ) ); ?>
</pre>
-->
endif;
?>
</body>
-</html>
\ No newline at end of file
+</html>
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff