Changeset 19529

Timestamp:

12/01/11 05:03:11 (2 years ago)

Author:

nacin

Message:

Push logic into _redirect_to_about_wordpress() and be more specific about which context this runs under. see #18467.

File:

• trunk/wp-admin/includes/update-core.php (modified) (2 diffs)

trunk/wp-admin/includes/update-core.php

@@ -537 +537 @@
  */
 function _redirect_to_about_wordpress( $wp_version ) {
+    global $wp_version, $pagenow, $action;
+
+    if ( 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 )
+        return;
+
+    if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
+        return;
+ 
     // Load the updated default text localization domain for new strings
     load_default_textdomain();
@@ -555 +567 @@
     exit();
 }
-if ( version_compare( $GLOBALS['wp_version'], '3.3', '<' ) && 'update-core.php' == $GLOBALS['pagenow'] )
-    add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );