golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2012-05-25 13:43:35 +00:00
parent 206e266cad
commit 4c7e03281b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/update-core.php
View File

@ -666,7 +666,7 @@ function _copy_dir($from, $to, $skip_list = array() ) {
/** /**
* Redirect to the About WordPress page after a successful upgrade. * 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 * @since 3.3.0
* *
@ -674,13 +674,8 @@ function _copy_dir($from, $to, $skip_list = array() ) {
function _redirect_to_about_wordpress( $new_version ) { function _redirect_to_about_wordpress( $new_version ) {
global $wp_version, $pagenow, $action; global $wp_version, $pagenow, $action;
if ( is_multisite() ) { if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
// Change to self_admin_url().
if ( version_compare( $wp_version, '3.4-alpha', '>=' ) )
return; 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. // 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 ) if ( 'update-core.php' != $pagenow )