Changeset 40575

Timestamp:

05/06/2017 02:29:01 PM (3 years ago)

Author:

swissspidy

Message:

Cron API: Add a new wp_doing_cron() helper function.

This replaces DOING_CRON checks via the constant.

Props tfrommen.
Fixes #39591.

Location:

trunk/src

Files:

• wp-admin/includes/class-plugin-upgrader.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (2 diffs)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/update.php (modified) (8 diffs)

trunk/src/wp-admin/includes/class-plugin-upgrader.php

@@ -407 +407 @@
 
         // When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
-        if ( defined( 'DOING_CRON' ) && DOING_CRON )
+        if ( wp_doing_cron() )
             return $return;
 

trunk/src/wp-admin/includes/file.php

@@ -664 +664 @@
      * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
      */
-    if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+    if ( wp_doing_cron() ) {
         $available_space = @disk_free_space( WP_CONTENT_DIR );
         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.
      */
-    if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+    if ( wp_doing_cron() ) {
         $available_space = @disk_free_space( WP_CONTENT_DIR );
         if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )

trunk/src/wp-admin/includes/update.php

@@ -108 +108 @@
 
     $options = array(
-        'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+        'timeout' => wp_doing_cron() ? 30 : 3,
     );
 

trunk/src/wp-includes/load.php

@@ -1061 +1061 @@
 
 /**
+ * Determines whether the current request is a WordPress cron request.
+ *
+ * @since 4.8.0
+ *
+ * @return bool True if it's a WordPress cron request, false otherwise.
+ */
+function wp_doing_cron() {
+    /**
+     * Filters whether the current request is a WordPress cron request.
+     *
+     * @since 4.8.0
+     *
+     * @param bool $wp_doing_cron Whether the current request is a WordPress cron request.
+     */
+    return apply_filters( 'wp_doing_cron', defined( 'DOING_CRON' ) && DOING_CRON );
+}
+
+/**
  * Check whether variable is a WordPress Error.
  *

trunk/src/wp-includes/update.php

@@ -109 +109 @@
         $url = set_url_scheme( $url, 'https' );
 
+    $doing_cron = wp_doing_cron();
+
     $options = array(
-        'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+        'timeout' => $doing_cron ? 30 : 3,
         'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
         'headers' => array(
@@ -178 +180 @@
 
     // Trigger background updates if running non-interactively, and we weren't called from the update handler.
-    if ( defined( 'DOING_CRON' ) && DOING_CRON && ! doing_action( 'wp_maybe_auto_update' ) ) {
+    if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) {
         do_action( 'wp_maybe_auto_update' );
     }
@@ -217 +219 @@
     $new_option = new stdClass;
     $new_option->last_checked = time();
+
+    $doing_cron = wp_doing_cron();
 
     // Check for update on a different schedule, depending on the page.
@@ -231 +235 @@
             break;
         default :
-            if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+            if ( $doing_cron ) {
                 $timeout = 0;
             } else {
@@ -283 +287 @@
     $locales = array_unique( $locales );
 
-    if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+    if ( $doing_cron ) {
         $timeout = 30;
     } else {
@@ -400 +404 @@
         );
     }
+
+    $doing_cron = wp_doing_cron();
 
     // Check for update on a different schedule, depending on the page.
@@ -414 +420 @@
             break;
         default :
-            if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-                $timeout = 0;
-            } else {
-                $timeout = 12 * HOUR_IN_SECONDS;
-            }
+            $timeout = $doing_cron ? 0 : 12 * HOUR_IN_SECONDS;
     }
 
@@ -464 +466 @@
     $locales = array_unique( $locales );
 
-    if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+    if ( $doing_cron ) {
         $timeout = 30;
     } else {