diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
| commit | 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc (patch) | |
| tree | c6fd23b598f3994eddb18cb1c0f2e8d95ff054fa /wp-admin/upgrade.php | |
| parent | f650f48c048bfbbb2ae702b6425d87e39358d748 (diff) | |
| download | wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.gz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.xz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.zip | |
Merged with WordPress 2.5, unstable, only for testing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/upgrade.php')
| -rw-r--r-- | wp-admin/upgrade.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index b8069b5..d7274d1 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -1,7 +1,7 @@ <?php define('WP_INSTALLING', true); if (!file_exists('../wp-config.php')) - die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file."); + die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='setup-config.php' class='button'>Create a Configuration File</a>"); require('../wp-config.php'); timer_start(); @@ -27,17 +27,19 @@ else <h2><?php _e('No Upgrade Required'); ?></h2> <p><?php _e('Your WordPress database is already up-to-date!'); ?></p> -<h2 class="step"><a href="<?php echo get_option('home'); ?>/"><?php _e('Continue »'); ?></a></h2> +<h2 class="step"><a href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></h2> <?php else : switch($step) : case 0: - $goback = clean_url(stripslashes(wp_get_referer())); + $goback = stripslashes(wp_get_referer()); + $goback = clean_url($goback, null, 'url'); + $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> -<h2 class="step"><a href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress »'); ?></a></h2> +<h2 class="step"><a href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress'); ?></a></h2> <?php break; case 1: @@ -45,8 +47,10 @@ switch($step) : if ( empty( $_GET['backto'] ) ) $backto = __get_option('home') . '/'; - else - $backto = clean_url(stripslashes($_GET['backto'])); + else { + $backto = stripslashes(urldecode($_GET['backto'])); + $backto = clean_url($backto, null, 'url'); + } if( $wpdb->get_row( "SELECT blog_id FROM wp_blog_versions WHERE blog_id = '{$wpdb->blogid}'" ) ) { $wpdb->query( "UPDATE wp_blog_versions SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" ); } else { @@ -55,7 +59,7 @@ switch($step) : ?> <h2><?php _e('Upgrade Complete'); ?></h2> <p><?php _e('Your WordPress database has been successfully upgraded!'); ?></p> - <h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue »'); ?></a></h2> + <h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></h2> <!-- <pre> |