Changeset 40575
- Timestamp:
- 05/06/2017 02:29:01 PM (8 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/class-plugin-upgrader.php
r39211 r40575 407 407 408 408 // When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it 409 if ( defined( 'DOING_CRON' ) && DOING_CRON)409 if ( wp_doing_cron() ) 410 410 return $return; 411 411 -
trunk/src/wp-admin/includes/file.php
r39656 r40575 664 664 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer. 665 665 */ 666 if ( defined( 'DOING_CRON' ) && DOING_CRON) {666 if ( wp_doing_cron() ) { 667 667 $available_space = @disk_free_space( WP_CONTENT_DIR ); 668 668 if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) … … 770 770 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer. 771 771 */ 772 if ( defined( 'DOING_CRON' ) && DOING_CRON) {772 if ( wp_doing_cron() ) { 773 773 $available_space = @disk_free_space( WP_CONTENT_DIR ); 774 774 if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) -
trunk/src/wp-admin/includes/update.php
r39325 r40575 108 108 109 109 $options = array( 110 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),110 'timeout' => wp_doing_cron() ? 30 : 3, 111 111 ); 112 112 -
trunk/src/wp-includes/load.php
r40394 r40575 1061 1061 1062 1062 /** 1063 * Determines whether the current request is a WordPress cron request. 1064 * 1065 * @since 4.8.0 1066 * 1067 * @return bool True if it's a WordPress cron request, false otherwise. 1068 */ 1069 function wp_doing_cron() { 1070 /** 1071 * Filters whether the current request is a WordPress cron request. 1072 * 1073 * @since 4.8.0 1074 * 1075 * @param bool $wp_doing_cron Whether the current request is a WordPress cron request. 1076 */ 1077 return apply_filters( 'wp_doing_cron', defined( 'DOING_CRON' ) && DOING_CRON ); 1078 } 1079 1080 /** 1063 1081 * Check whether variable is a WordPress Error. 1064 1082 * -
trunk/src/wp-includes/update.php
r39326 r40575 109 109 $url = set_url_scheme( $url, 'https' ); 110 110 111 $doing_cron = wp_doing_cron(); 112 111 113 $options = array( 112 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),114 'timeout' => $doing_cron ? 30 : 3, 113 115 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ), 114 116 'headers' => array( … … 178 180 179 181 // Trigger background updates if running non-interactively, and we weren't called from the update handler. 180 if ( defined( 'DOING_CRON' ) && DOING_CRON&& ! doing_action( 'wp_maybe_auto_update' ) ) {182 if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) { 181 183 do_action( 'wp_maybe_auto_update' ); 182 184 } … … 217 219 $new_option = new stdClass; 218 220 $new_option->last_checked = time(); 221 222 $doing_cron = wp_doing_cron(); 219 223 220 224 // Check for update on a different schedule, depending on the page. … … 231 235 break; 232 236 default : 233 if ( defined( 'DOING_CRON' ) && DOING_CRON) {237 if ( $doing_cron ) { 234 238 $timeout = 0; 235 239 } else { … … 283 287 $locales = array_unique( $locales ); 284 288 285 if ( defined( 'DOING_CRON' ) && DOING_CRON) {289 if ( $doing_cron ) { 286 290 $timeout = 30; 287 291 } else { … … 400 404 ); 401 405 } 406 407 $doing_cron = wp_doing_cron(); 402 408 403 409 // Check for update on a different schedule, depending on the page. … … 414 420 break; 415 421 default : 416 if ( defined( 'DOING_CRON' ) && DOING_CRON ) { 417 $timeout = 0; 418 } else { 419 $timeout = 12 * HOUR_IN_SECONDS; 420 } 422 $timeout = $doing_cron ? 0 : 12 * HOUR_IN_SECONDS; 421 423 } 422 424 … … 464 466 $locales = array_unique( $locales ); 465 467 466 if ( defined( 'DOING_CRON' ) && DOING_CRON) {468 if ( $doing_cron ) { 467 469 $timeout = 30; 468 470 } else {
Note: See TracChangeset
for help on using the changeset viewer.