Changeset 42586
- Timestamp:
- 01/24/2018 04:31:40 AM (7 years ago)
- Location:
- branches/4.9
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.9
-
branches/4.9/src/wp-includes/update.php
r41967 r42586 169 169 } 170 170 171 $offers = $body['offers']; 171 $offers = $body['offers']; 172 $has_auto_update = false; 172 173 173 174 foreach ( $offers as &$offer ) { … … 183 184 $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale', 184 185 'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files' ), '' ) ); 186 187 if ( 'autoupdate' == $offer->response ) { 188 $has_auto_update = true; 189 } 185 190 } 186 191 … … 204 209 205 210 // Trigger background updates if running non-interactively, and we weren't called from the update handler. 206 if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) { 207 do_action( 'wp_maybe_auto_update' ); 211 if ( $doing_cron && $has_auto_update && ! doing_action( 'wp_maybe_auto_update' ) ) { 212 include_once( ABSPATH . '/wp-admin/includes/update.php' ); 213 214 // Only trigger background updates if an acceptable autoupdate is on offer, avoids needless extra API calls. 215 if ( find_core_auto_update() ) { 216 do_action( 'wp_maybe_auto_update' ); 217 } 208 218 } 209 219 } … … 260 270 default : 261 271 if ( $doing_cron ) { 262 $timeout = 0;272 $timeout = 2 * HOUR_IN_SECONDS; 263 273 } else { 264 274 $timeout = 12 * HOUR_IN_SECONDS; … … 444 454 break; 445 455 default : 446 $timeout = $doing_cron ? 0 : 12 * HOUR_IN_SECONDS; 456 if ( $doing_cron ) { 457 $timeout = 2 * HOUR_IN_SECONDS; 458 } else { 459 $timeout = 12 * HOUR_IN_SECONDS; 460 } 447 461 } 448 462
Note: See TracChangeset
for help on using the changeset viewer.