Ticket #18467: 18467.3.patch

wp-admin/includes/update-core.php

@@ -465 +465 @@
 
         // Remove maintenance file, we're done.
         $wp_filesystem->delete($maintenance_file);
+        
+        // No return yet => succesfull
+        do_action( '_core_updated_successfully' );
 }
 
 /**
@@ -531 +534 @@
  *
  */
 function _redirect_to_about_wordpress() {
-        // Only for WP version < 3.3.0
+        // Only for WP version < 3.3.0 
         if ( version_compare( $GLOBALS['wp_version'], '3.3.0', '>' ) )
                 return;
+
+        // Load the updated default text localization domain for new strings
+        unload_textdomain( 'default' ); // Needed?
+        $locale = get_locale();
+        load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
+        
+        // Show info messages, see do_core_upgrade()
+        show_message( __('WordPress updated successfully') );
+        show_message( sprintf( __('You will be redirected to the About WordPress Page, if not click <a href="%s">here</a>'), esc_url( admin_url( 'about.php?upgraded' ) ) ) );
+        echo '</div>';
+
+        // Print javascript data
+        add_action( 'admin_footer-update-core.php', '_print_js_redirect_to_about_wordpress' );
+        
+        // Include admin-footer.php and exit
+        include(ABSPATH . 'wp-admin/admin-footer.php');
+        exit();
+}
+add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+
+/**
+ * Print Javascript data for _redirect_to_about_wordpress().
+ *
+ * This is a temporary function for the 3.3 upgrade only and will be removed in a later version.
+ * 
+ * @since 3.3.0
+ *
+ */
+function _print_js_redirect_to_about_wordpress() {
 ?>
 <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' );
-?>