Ticket #45976: 45976.diff

src/wp-includes/cron.php

@@ -481 +481 @@
 /**
  * Retrieve a scheduled event.
  *
- * Retrieve the full event object for a given event.
+ * Retrieve the full event object for a given event, if no timestamp is specified the next
+ * scheduled event is returned.
  *
  * @since 5.1.0
  *
@@ -493 +494 @@
  * @return bool|object The event object. False if the event does not exist.
  */
 function wp_get_scheduled_event( $hook, $args = array(), $timestamp = null ) {
-        if ( ! $timestamp ) {
-                // Get the next scheduled event.
-                $timestamp = wp_next_scheduled( $hook, $args );
-        }
-
         /**
          * Filter to preflight or hijack retrieving a scheduled event.
          *
@@ -521 +517 @@
                 return $pre;
         }
 
-        $crons = _get_cron_array();
-        $key   = md5( serialize( $args ) );
+        if ( null !== $timestamp & ! is_numeric( $timestamp ) ) {
+                return false;
+        }
 
-        if ( ! $timestamp || ! isset( $crons[ $timestamp ] ) ) {
-                // No such event.
+        $crons = _get_cron_array();
+        if ( empty( $crons ) ) {
                 return false;
         }
 
-        if ( ! isset( $crons[ $timestamp ][ $hook ] ) || ! isset( $crons[ $timestamp ][ $hook ][ $key ] ) ) {
+        $key = md5( serialize( $args ) );
+
+        if ( ! $timestamp ) {
+                // Get next event.
+                $next = false;
+                foreach ( $crons as $timestamp => $cron ) {
+                        if ( isset( $cron[ $hook ][ $key ] ) ) {
+                                $next = $timestamp;
+                                break;
+                        }
+                }
+                if ( ! $next ) {
+                        return false;
+                }
+
+                $timestamp = $next;
+        } elseif ( ! isset( $crons[ $timestamp ][ $hook ][ $key ] ) ) {
                 return false;
         }
 
@@ -551 +564 @@
  * Retrieve the next timestamp for an event.
  *
  * @since 2.1.0
- * @since 5.1.0 {@see 'pre_next_scheduled'} and {@see 'next_scheduled'} filters added.
  *
  * @param string $hook Action hook of the event.
  * @param array  $args Optional. Array containing each separate argument to pass to the hook's callback function.
@@ -560 +572 @@
  * @return false|int The Unix timestamp of the next time the event will occur. False if the event doesn't exist.
  */
 function wp_next_scheduled( $hook, $args = array() ) {
-        /**
-         * Filter to preflight or hijack retrieving the next scheduled event timestamp.
-         *
-         * Returning a non-null value will short-circuit the normal retrieval
-         * process, causing the function to return the filtered value instead.
-         *
-         * Pass the timestamp of the next event if it exists, false if not.
-         *
-         * @since 5.1.0
-         *
-         * @param null|bool $pre       Value to return instead. Default null to continue unscheduling the event.
-         * @param string    $hook      Action hook of the event.
-         * @param array     $args      Arguments to pass to the hook's callback function.
-         */
-        $pre = apply_filters( 'pre_next_scheduled', null, $hook, $args );
-        if ( null !== $pre ) {
-                return $pre;
-        }
-
-        $crons = _get_cron_array();
-        $key   = md5( serialize( $args ) );
-        $next  = false;
-
-        if ( ! empty( $crons ) ) {
-                foreach ( $crons as $timestamp => $cron ) {
-                        if ( isset( $cron[ $hook ][ $key ] ) ) {
-                                $next = $timestamp;
-                                break;
-                        }
-                }
+        $next_event = wp_get_scheduled_event( $hook, $args );
+        if ( ! $next_event ) {
+                return false;
         }
 
-        /**
-         * Filter the next scheduled event timestamp.
-         *
-         * @since 5.1.0
-         *
-         * @param int|bool $next The UNIX timestamp when the scheduled event will next occur, or false if not found.
-         * @param string   $hook Action hook to execute when cron is run.
-         * @param array    $args Arguments to be passed to the callback function. Used for deduplicating events.
-         */
-        return apply_filters( 'next_scheduled', $next, $hook, $args );
+        return $next_event->timestamp;
 }
 
 /**