Ticket #51716: 51716.diff

wp-cron.php

@@ -1 +1 @@
 <?php
 /**
- * A pseudo-cron daemon for scheduling WordPress tasks.
+ * A pseudo-CRON daemon for scheduling WordPress tasks
  *
- * WP-Cron is triggered when the site receives a visit. In the scenario
+ * WP Cron is triggered when the site receives a visit. In the scenario
  * where a site may not receive enough visits to execute scheduled tasks
  * in a timely manner, this file can be called directly or via a server
- * cron daemon for X number of times.
+ * CRON daemon for X number of times.
  *
  * Defining DISABLE_WP_CRON as true and calling this file directly are
  * mutually exclusive and the latter does not rely on the former to work.
  *
  * The HTTP request to this file will not slow down the visitor who happens to
- * visit when a scheduled cron event runs.
+ * visit when the cron job is needed to run.
  *
  * @package WordPress
  */
@@ -33 +33 @@
 }
 
 /**
- * Tell WordPress we are doing the cron task.
+ * Tell WordPress we are doing the CRON task.
  *
  * @var bool
  */
@@ -109 +109 @@
         return;
 }
 
+/*
+ * Store cron job to be executed.
+ */
+$cron_jobs = [];
+
+// Schedule and reschedule cron jobs.
 foreach ( $crons as $timestamp => $cronhooks ) {
         if ( $timestamp > $gmt_time ) {
                 break;
@@ -126 +132 @@
 
                         wp_unschedule_event( $timestamp, $hook, $v['args'] );
 
-                        /**
-                         * Fires scheduled events.
-                         *
-                         * @ignore
-                         * @since 2.1.0
-                         *
-                         * @param string $hook Name of the hook that was scheduled to be fired.
-                         * @param array  $args The arguments to be passed to the hook.
-                         */
-                        do_action_ref_array( $hook, $v['args'] );
+                        // Register jobs to be executed.
+                        $cron_jobs[] = [
+                                'timestamp' => $timestamp,
+                                'hook'      => $hook,
+                                'args'      => isset( $v['args'] ) ? (array) $v['args'] : [],
+                                'schedule'  => $schedule,
+                        ];
 
                         // If the hook ran too long and another cron process stole the lock, quit.
                         if ( _get_cron_lock() !== $doing_wp_cron ) {
+                                do_action( 'wp_cron_schedule_aborted' );
                                 return;
                         }
                 }
@@ -149 +153 @@
         delete_transient( 'doing_cron' );
 }
 
+// Let's do the cron jobs.
+foreach ( $cron_jobs as $job ) {
+        /**
+         * Get cron executor.
+         *
+         * By default, `do_action_ref_array` will called.
+         *
+         * @since 5.6.0
+         *
+         * @param array $jobs Cron task to be executed.
+         */
+        $callback = apply_filters( 'wp_cron_job_callback', 'do_action_ref_array', $job );
+        try {
+                do_action( 'wp_cron_before_execution', $job );
+                /**
+                 * Fires scheduled events by callback.
+                 *
+                 * By default, `do_action_ref_array` will called.
+                 *
+                 * @ignore
+                 * @since 2.1.0
+                 * @since 5.6.0 This hook runs by default, but can be overridden.
+                 *
+                 * @param string $hook Name of the hook that was scheduled to be fired.
+                 * @param array  $args The arguments to be passed to the hook.
+                 */
+                call_user_func_array( $callback, [ $job['hook'], $job['args'] ] );
+                do_action( 'wp_cron_after_execution', $job );
+        } catch ( Exception $e ) {
+                do_action( 'wp_cron_execution_error', $e );
+        }
+}
+
 die();