From e04b4d47b416a196d01c9c24b84ce2a215d74c3a Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Tue, 6 Feb 2018 11:03:55 +0000 Subject: [PATCH] Updates: Partially revert [42584], as this branch of code should always be run after a core update check. This code branch is responsible for running all autoupdates, including plugins and themes - which should run regardless of if there's a core autoupdate available. This revert does not revert the `$timeout` changes, as these should still use cached data if it's available. Ideally this should be decoupled from the core update check to allow background updates to operate even when the core update check is disabled or running more often than twice daily. See #43103. git-svn-id: https://develop.svn.wordpress.org/trunk@42653 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/update.php | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php index 77f801f301..0f23e2a987 100644 --- a/src/wp-includes/update.php +++ b/src/wp-includes/update.php @@ -173,8 +173,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { return; } - $offers = $body['offers']; - $has_auto_update = false; + $offers = $body['offers']; foreach ( $offers as &$offer ) { foreach ( $offer as $offer_key => $value ) { @@ -208,10 +207,6 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { ), '' ) ); - - if ( 'autoupdate' == $offer->response ) { - $has_auto_update = true; - } } $updates = new stdClass(); @@ -234,13 +229,8 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { } // Trigger background updates if running non-interactively, and we weren't called from the update handler. - if ( $doing_cron && $has_auto_update && ! doing_action( 'wp_maybe_auto_update' ) ) { - include_once( ABSPATH . '/wp-admin/includes/update.php' ); - - // Only trigger background updates if an acceptable autoupdate is on offer, avoids needless extra API calls. - if ( find_core_auto_update() ) { - do_action( 'wp_maybe_auto_update' ); - } + if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) { + do_action( 'wp_maybe_auto_update' ); } }