From fd676baa810d85e10855cb7d34d6ebfdb681a172 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 23 Nov 2011 23:38:36 +0000
Subject: [PATCH] Redirect to about.php on update. props ocean90. see #18467.

git-svn-id: http://svn.automattic.com/wordpress/trunk@19442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php                |  6 ++++--
 wp-admin/includes/update-core.php | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 0937da3bc..dc211ef23 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -161,8 +161,10 @@ include( './admin-header.php' );
 </div>
 
 <div class="return-to-dashboard">
-	<a href="<?php echo admin_url( 'update-core.php' ); ?>"><?php _e( 'Return to Dashboard &rarr; Updates' ); ?></a> |
-	<a href="<?php echo admin_url(); ?>"><?php _e( 'Go to Dashboard &rarr; Home' ); ?></a>
+	<?php if ( current_user_can( 'update_core' ) && isset( $_GET['upgraded'] ) ) : ?>
+	<a href="<?php echo esc_url( admin_url( 'update-core.php' ) ); ?>"><?php _e( 'Return to Dashboard &rarr; Updates' ); ?></a> |
+	<?php endif; ?>
+	<a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Go to Dashboard &rarr; Home' ); ?></a>
 </div>
 
 </div>
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 50f50ddc5..617200aea 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -522,4 +522,24 @@ function _copy_dir($from, $to, $skip_list = array() ) {
 	return true;
 }
 
+/**
+ * Redirect to the About WordPress page after a successful upgrade.
+ *
+ * This is a temporary function for the 3.3 upgrade only and will be removed in a later version.
+ * 
+ * @since 3.3.0
+ *
+ */
+function _redirect_to_about_wordpress() {
+	// Only for WP version < 3.3.0
+	if ( version_compare( $GLOBALS['wp_version'], '3.3.0', '>' ) )
+		return;
+?>
+<script type="text/javascript">
+window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
+</script>
+<?php
+}
+
+add_action( 'admin_footer-update-core.php', '_redirect_to_about_wordpress' );
 ?>