Changes in trunk/wp-includes/cron.php [14414:16938]

File:

• trunk/wp-includes/cron.php (modified) (7 diffs)

trunk/wp-includes/cron.php

@@ -27 +27 @@
 
         $crons = _get_cron_array();
-        $key = md5(serialize($args));
-        $crons[$timestamp][$hook][$key] = array( 'schedule' => false, 'args' => $args );
+        $event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
+        $event = apply_filters('schedule_event', $event);
+
+        // A plugin disallowed this event
+        if ( ! $event )
+                return false;
+
+        $key = md5(serialize($event->args));
+
+        $crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args );
         uksort( $crons, "strnatcasecmp" );
         _set_cron_array( $crons );
@@ -42 +50 @@
  * Valid values for the recurrence are hourly, daily and twicedaily.  These can
  * be extended using the cron_schedules filter in wp_get_schedules().
+ *
+ * Use wp_next_scheduled() to prevent duplicates
  *
  * @since 2.1.0
@@ -54 +64 @@
         $crons = _get_cron_array();
         $schedules = wp_get_schedules();
-        $key = md5(serialize($args));
+
         if ( !isset( $schedules[$recurrence] ) )
                 return false;
-        $crons[$timestamp][$hook][$key] = array( 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+
+        $event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+        $event = apply_filters('schedule_event', $event);
+
+        // A plugin disallowed this event
+        if ( ! $event )
+                return false;
+
+        $key = md5(serialize($event->args));
+
+        $crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval );
         uksort( $crons, "strnatcasecmp" );
         _set_cron_array( $crons );
@@ -91 +111 @@
         $now = time();
 
-    if ( $timestamp >= $now )
-        $timestamp = $now + $interval;
-    else
-        $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
+        if ( $timestamp >= $now )
+                $timestamp = $now + $interval;
+        else
+                $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 
         wp_schedule_event( $timestamp, $recurrence, $hook, $args );
@@ -137 +157 @@
         // Previously this function took the arguments as discrete vars rather than an array like the rest of the API
         if ( !is_array($args) ) {
-                _deprecated_argument( __FUNCTION__, '3.0.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
+                _deprecated_argument( __FUNCTION__, '3.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
                 $args = array_slice( func_get_args(), 1 );
         }
@@ -179 +199 @@
 
         if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
-                return;
-
-        /*
-         * do not even start the cron if local server timer has drifted
-         * such as due to power failure, or misconfiguration
-         */
-        $timer_accurate = check_server_timer( $local_time );
-        if ( !$timer_accurate )
                 return;
 
@@ -394 +406 @@
         return $new_cron;
 }
-
-// stub for checking server timer accuracy, using outside standard time sources
-function check_server_timer( $local_time ) {
-        return true;
-}