Changeset 42654 for branches/4.9/src/wp-includes/update.php

Timestamp:

02/06/2018 12:46:50 PM (9 years ago)

Author:

dd32

Message:

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.

Merges [42653] to the 4.9 branch.
Fixes #43103, #43235.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/update.php (modified) (3 diffs)

branches/4.9/src/wp-includes/update.php

@@ -169 +169 @@
         }
 
-        $offers          = $body['offers'];
-        $has_auto_update = false;
+        $offers = $body['offers'];
 
         foreach ( $offers as &$offer ) {
@@ -184 +183 @@
                 $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
                         'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files' ), '' ) );
-
-                if ( 'autoupdate' == $offer->response ) {
-                        $has_auto_update = true;
-                }
         }
 
@@ -209 +204 @@
 
         // 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' );
         }
 }