From 4c7e03281b51b52389bffcb264d10dde38dd2839 Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 25 May 2012 13:43:35 +0000 Subject: [PATCH] Run _redirect_to_about_wordpress() in 3.4 due to the change in [20894] and the reliance on ?updated in [20887]. see #19599. git-svn-id: http://core.svn.wordpress.org/trunk@20895 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update-core.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 67e4f81eb..541e35f83 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -666,7 +666,7 @@ function _copy_dir($from, $to, $skip_list = array() ) { /** * Redirect to the About WordPress page after a successful upgrade. * - * This function is only needed when the existing install is older than 3.3.0 (3.4.0 for multisite). + * This function is only needed when the existing install is older than 3.4.0. * * @since 3.3.0 * @@ -674,13 +674,8 @@ function _copy_dir($from, $to, $skip_list = array() ) { function _redirect_to_about_wordpress( $new_version ) { global $wp_version, $pagenow, $action; - if ( is_multisite() ) { - // Change to self_admin_url(). - if ( version_compare( $wp_version, '3.4-alpha', '>=' ) ) + if ( version_compare( $wp_version, '3.4-RC1', '>=' ) ) return; - } elseif ( version_compare( $wp_version, '3.3', '>=' ) ) { - return; - } // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts. if ( 'update-core.php' != $pagenow )