golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elbow room for upgrade.php 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2009-04-17 08:00:48 +00:00
parent 281d9a19f9
commit f14080686d
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
wp-admin/upgrade.php
View File

@ -12,15 +12,15 @@
* @since unknown * @since unknown
* @var bool * @var bool
*/ */
define('WP_INSTALLING', true); define( 'WP_INSTALLING', true );
/** Load WordPress Bootstrap */ /** Load WordPress Bootstrap */
require('../wp-load.php'); require( '../wp-load.php' );
timer_start(); timer_start();
require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
if ( isset($_GET['step']) ) if ( isset( $_GET['step'] ) )
$step = $_GET['step']; $step = $_GET['step'];
else else
$step = 0; $step = 0;
@ -28,61 +28,61 @@ else
// Do it. No output. // Do it. No output.
if ( 'upgrade_db' === $step ) { if ( 'upgrade_db' === $step ) {
wp_upgrade(); wp_upgrade();
die('0'); die( '0' );
} }
$step = (int) $step; $step = (int) $step;
@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @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"> <!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(); ?>> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
<head> <head>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
<title><?php _e('WordPress &rsaquo; Upgrade'); ?></title> <title><?php _e( 'WordPress &rsaquo; Upgrade' ); ?></title>
<?php wp_admin_css( 'install', true ); ?> <?php wp_admin_css( 'install', true ); ?>
</head> </head>
<body> <body>
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
<?php if ( get_option('db_version') == $wp_db_version || !is_blog_installed()) : ?> <?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
<h2><?php _e('No Upgrade Required'); ?></h2> <h2><?php _e( 'No Upgrade Required' ); ?></h2>
<p><?php _e('Your WordPress database is already up-to-date!'); ?></p> <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> <p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
<?php else : <?php else :
switch($step) : switch ( $step ) :
case 0: case 0:
$goback = stripslashes(wp_get_referer()); $goback = stripslashes( wp_get_referer() );
$goback = clean_url($goback, null, 'url'); $goback = clean_url( $goback, null, 'url' );
$goback = urlencode($goback); $goback = urlencode( $goback );
?> ?>
<h2><?php _e('Database Upgrade Required'); ?></h2> <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( '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><?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&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress Database'); ?></a></p> <p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Upgrade WordPress Database' ); ?></a></p>
<?php <?php
break; break;
case 1: case 1:
wp_upgrade(); wp_upgrade();
if ( empty( $_GET['backto'] ) ) if ( empty( $_GET['backto'] ) )
$backto = __get_option('home') . '/'; $backto = __get_option( 'home' ) . '/';
else { else {
$backto = stripslashes(urldecode($_GET['backto'])); $backto = stripslashes( urldecode( $_GET['backto'] ) );
$backto = clean_url($backto, null, 'url'); $backto = clean_url( $backto, null, 'url' );
} }
?> ?>
<h2><?php _e('Upgrade Complete'); ?></h2> <h2><?php _e( 'Upgrade Complete' ); ?></h2>
<p><?php _e('Your WordPress database has been successfully upgraded!'); ?></p> <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> <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
<!-- <!--
<pre> <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> </pre>
--> -->