Wordpress 2.0.11

[autoinstalls/wordpress.git] / wp-admin / upgrade.php

diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 53eb154924187d4830fa4452456b8af59d0cffd7..aa459514772d6ec5383cc190b5c857927b108ff1 100644 (file)
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -67,7 +67,7 @@ text-align: center; border-top: 1px solid #ccc; padding-top: 1em; font-style: it
 switch($step) {
 
        case 0:
-       $goback = wp_specialchars($_SERVER['HTTP_REFERER'], 1);
+       $goback = clean_url(stripslashes(wp_get_referer()));
 ?> 
 <p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p> 
        <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
@@ -75,15 +75,18 @@ switch($step) {
        break;
        
        case 1:
-       wp_cache_flush();
-       make_db_current_silent();
-       upgrade_all();
-       wp_cache_flush();
+       $wp_current_db_version = __get_option('db_version');
+       if ( $wp_db_version != $wp_current_db_version ) {
+               wp_cache_flush();
+               make_db_current_silent();
+               upgrade_all();
+               wp_cache_flush();
+       }
 
        if ( empty( $_GET['backto'] ) )
                $backto = __get_option('home');
        else
-               $backto = wp_specialchars( $_GET['backto'] , 1 );
+               $backto = clean_url(stripslashes($_GET['backto']));
 ?> 
 <h2><?php _e('Step 1'); ?></h2> 
        <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"),  $backto); ?></p>