Wordpress 2.5.1

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

diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 1758d4c9b3d53a8dbb70b3bf5b36faa2426186a7..67618d0aff1b45716e8337804e2f106f17a44d05 100644 (file)
--- 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 &raquo;'); ?></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&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
+<h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress'); ?></a></h2>
 <?php
                break;
        case 1:
@@ -45,12 +47,14 @@ 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');
+               }
 ?>
 <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 &raquo;'); ?></a></h2>
+       <h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></h2>
 
 <!--
 <pre>