Changeset 25750
- Timestamp:
- 10/10/2013 01:31:22 AM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/class-wp-upgrader.php
r25700 r25750 1300 1300 1301 1301 // In the event of an error, rollback to the previous version 1302 if ( is_wp_error( $result ) && $parsed_args['attempt_rollback'] && $current->packages->rollback ) {1302 if ( is_wp_error( $result ) && $parsed_args['attempt_rollback'] && $current->packages->rollback && ! $parsed_args['do_rollback'] ) { 1303 1303 apply_filters( 'update_feedback', $result ); 1304 1304 apply_filters( 'update_feedback', $this->strings['start_rollback'] ); 1305 1305 1306 $ this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );1307 1308 $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'] );1306 $rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) ); 1307 1308 $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], array( 'rollback' => $rollback_result, 'update' => $result ) ); 1309 1309 } 1310 1310 do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result ); … … 1727 1727 // Next, Process any core upgrade 1728 1728 wp_version_check(); // Check for Core updates 1729 $extra_update_stats = array(); 1729 1730 $core_update = find_core_auto_update(); 1730 1731 if ( $core_update ) { 1731 self::upgrade( 'core', $core_update ); 1732 $start_time = time(); 1733 $core_update_result = self::upgrade( 'core', $core_update ); 1732 1734 delete_site_transient( 'update_core' ); 1735 $extra_update_stats['success'] = is_wp_error( $core_update_result ) ? $core_update_result->get_error_code() : true; 1736 if ( is_wp_error( $core_update_result ) && 'rollback_was_required' == $core_update_result->get_error_code() ) { 1737 $rollback_data = $core_update_result->get_error_data(); 1738 $extra_update_stats['success'] = is_wp_error( $rollback_data['update'] ) ? $rollback_data['update']->get_error_code() : $rollback_data['update']; 1739 $extra_update_stats['rollback'] = is_wp_error( $rollback_data['rollback'] ) ? $rollback_data['rollback']->get_error_code() : $rollback_data['rollback']; 1740 } 1741 $extra_update_stats['fs_method'] = $GLOBALS['wp_filesystem']->method; 1742 $extra_update_stats['time_taken'] = ( time() - $start_time ); 1733 1743 } 1734 1744 1735 1745 // Cleanup, and check for any pending translations 1736 wp_version_check( ); // check for Core updates1746 wp_version_check( $extra_update_stats ); // check for Core updates 1737 1747 wp_update_themes(); // Check for Theme updates 1738 1748 wp_update_plugins(); // Check for Plugin updates -
trunk/src/wp-includes/update.php
r25699 r25750 18 18 * @uses $wp_version Used to check against the newest WordPress version. 19 19 * 20 * @param array $extra_stats Extra statistics to report to the WordPress.org API. 20 21 * @return mixed Returns null if update is unsupported. Returns false if check is too soon. 21 22 */ 22 function wp_version_check( ) {23 function wp_version_check( $extra_stats = array() ) { 23 24 if ( defined('WP_INSTALLING') ) 24 25 return; … … 40 41 $timeout = 60; 41 42 $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked ); 42 if ( $time_not_changed )43 if ( $time_not_changed && empty( $extra_args ) ) 43 44 return false; 44 45 … … 83 84 'blogs' => $num_blogs, 84 85 'users' => $user_count, 85 'multisite_enabled' => $multisite_enabled 86 'multisite_enabled' => $multisite_enabled, 86 87 ); 88 89 if ( $extra_stats ) 90 $query = array_merge( $query, $extra_stats ); 87 91 88 92 $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' ); … … 543 547 add_action( 'admin_init', '_maybe_update_core' ); 544 548 add_action( 'wp_version_check', 'wp_version_check' ); 545 add_action( 'upgrader_process_complete', 'wp_version_check' );549 add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 ); 546 550 547 551 add_action( 'load-plugins.php', 'wp_update_plugins' );
Note: See TracChangeset
for help on using the changeset viewer.