Ticket #25657: 25657.diff

src/wp-admin/includes/class-wp-upgrader.php

@@ -1316 +1316 @@
         function upgrade( $current, $args = array() ) {
                 global $wp_filesystem, $wp_version;
 
+                $start_time = time();
+
                 $defaults = array(
                         'pre_check_md5'    => true,
                         'attempt_rollback' => false,
@@ -1406 +1408 @@
                         }
                 }
 
+                // Clear the current updates
+                delete_site_transient( 'update_core' );
+
+                $extra_update_stats = array();
+                $extra_update_stats['success'] = is_wp_error( $result ) ? $result->get_error_code() : true;
+                $extra_update_stats['error_data'] = is_wp_error( $result ) ? $result->get_error_data() : '';
+
+                if ( is_wp_error( $result ) && 'rollback_was_required' == $result->get_error_code() ) {
+                        $rollback_data = $result->get_error_data();
+                        $extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update'];
+                        $extra_update_stats['error_data'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_data() : '';
+                        $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : true; // If it's not a WP_Error, the rollback was successful.
+                        $extra_update_stats['rollback_data'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_data() : '';
+                }
+
+                $extra_update_stats['fs_method'] = $wp_filesystem->method;
+                $extra_update_stats['fs_method_forced'] = defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' );
+                $extra_update_stats['time_taken'] = ( time() - $start_time );
+                $extra_update_stats['attempted'] = $current->version;
+                $extra_update_stats['attempted_type'] = $current->type;
+
+                wp_version_check( $extra_update_stats );
+
                 return $result;
         }
 
@@ -1904 +1929 @@
 
                 // Next, Process any core update
                 wp_version_check(); // Check for Core updates
-                $extra_update_stats = array();
                 $core_update = find_core_auto_update();
 
                 if ( $core_update ) {
-                        $start_time = time();
-
-                        $core_update_result = $this->update( 'core', $core_update );
-                        delete_site_transient( 'update_core' );
-
-                        $extra_update_stats['success'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_code() : true;
-                        $extra_update_stats['error_data'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_data() : '';
-
-                        if ( is_wp_error( $core_update_result ) && 'rollback_was_required' == $core_update_result->get_error_code() ) {
-                                $rollback_data = $core_update_result->get_error_data();
-                                $extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update'];
-                                $extra_update_stats['error_data'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_data() : '';
-                                $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : true; // If it's not a WP_Error, the rollback was successful.
-                                $extra_update_stats['rollback_data'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_data() : '';
-                        }
-
-                        $extra_update_stats['fs_method'] = $GLOBALS['wp_filesystem']->method;
-                        $extra_update_stats['fs_method_forced'] = defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' );
-                        $extra_update_stats['time_taken'] = ( time() - $start_time );
-                        $extra_update_stats['attempted'] = $core_update->version;
+                        $this->update( 'core', $core_update );
                 }
 
                 // Cleanup, and check for any pending translations
-                wp_version_check( $extra_update_stats );  // check for Core updates
+                // wp_version_check();  // Core_Upgrader does this
                 wp_update_themes();  // Check for Theme updates
                 wp_update_plugins(); // Check for Plugin updates
 

src/wp-includes/update.php

@@ -584 +584 @@
 
 add_action( 'admin_init', '_maybe_update_core' );
 add_action( 'wp_version_check', 'wp_version_check' );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
 
 add_action( 'load-plugins.php', 'wp_update_plugins' );
 add_action( 'load-update.php', 'wp_update_plugins' );