From d39db098d7027ef84c5cc72dd8df24314d098de1 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 1 Dec 2011 06:02:18 +0000
Subject: [PATCH] Remove debug cruft and fix variable collision. fixes #18467.

git-svn-id: https://develop.svn.wordpress.org/trunk@19532 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/update-core.php | 6 +++---
 wp-admin/update-core.php          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index c2c2599906..3588648d5b 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -535,7 +535,7 @@ function _copy_dir($from, $to, $skip_list = array() ) {
  * @since 3.3.0
  *
  */
-function _redirect_to_about_wordpress( $wp_version ) {
+function _redirect_to_about_wordpress( $new_version ) {
 	global $wp_version, $pagenow, $action;
 
 	if ( version_compare( $wp_version, '3.3', '>=' ) )
@@ -553,8 +553,8 @@ function _redirect_to_about_wordpress( $wp_version ) {
 
 	// See do_core_upgrade()
 	show_message( __('WordPress updated successfully') );
-	show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $wp_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
-	show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $wp_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
+	show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
+	show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
 	echo '</div>';
 	?>
 <script type="text/javascript">
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index c8de30815e..00e060ba1e 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -389,7 +389,7 @@ function do_core_upgrade( $reinstall = false ) {
 	?>
 	</div>
 	<script type="text/javascript">
-	//window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
+	window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
 	</script>
 	<?php
 }