Wordpress 2.8.5-scripts

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

diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 6f19e70cb4a1968db9571d387e23d182f9b138ca..7c093d1c8c0b701aa2ec7a306e6277a4c76996af 100644 (file)
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -68,13 +68,11 @@ switch ( $step ) :
                break;
        case 1:
                wp_upgrade();
-
-               if ( empty( $_GET['backto'] ) )
-                       $backto = __get_option( 'home' ) . '/';
-               else {
-                       $backto = stripslashes( urldecode( $_GET['backto'] ) );
+                       
+                       $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>