Changeset 42586 for branches/4.9

Timestamp:

01/24/2018 04:31:40 AM (9 years ago)

Author:

dd32

Message:

Updates: Only trigger Background Update processes from within the core update check when a core autoupdate is on offer.

This change reduces the number of API calls which WordPress makes to api.wordpress.org during release windows.

Previously the background updates would run upon every core update transient refresh, however now they'll only run if there's an update available.
The change also increases the cache period for plugin & theme checks when running via the cron, from never-cache to 2 hours, which should hopefully reduce the number of needless API calls.

Merges [42584] to the 4.9 branch.
Fixes #43103 for 4.9.

Location:

branches/4.9

Files:

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

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

@@ -169 +169 @@
         }
 
-        $offers = $body['offers'];
+        $offers          = $body['offers'];
+        $has_auto_update = false;
 
         foreach ( $offers as &$offer ) {
@@ -183 +184 @@
                 $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;
+                }
         }
 
@@ -204 +209 @@
 
         // Trigger background updates if running non-interactively, and we weren't called from the update handler.
-        if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) {
-                do_action( 'wp_maybe_auto_update' );
+        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' );
+                }
         }
 }
@@ -260 +270 @@
                 default :
                         if ( $doing_cron ) {
-                                $timeout = 0;
+                                $timeout = 2 * HOUR_IN_SECONDS;
                         } else {
                                 $timeout = 12 * HOUR_IN_SECONDS;
@@ -444 +454 @@
                         break;
                 default :
-                        $timeout = $doing_cron ? 0 : 12 * HOUR_IN_SECONDS;
+                        if ( $doing_cron ) {
+                                $timeout = 2 * HOUR_IN_SECONDS;
+                        } else {
+                                $timeout = 12 * HOUR_IN_SECONDS;
+                        }
         }