Changeset 29939

Timestamp:

10/17/2014 07:16:26 PM (10 years ago)

Author:

wonderboymusic

Message:

wp_schedule_single_event() should not prevent scheduling a future duplicate event. It should only reject an event as a duplicate if there is already a similar event scheduled within 10 minutes of the given timestamp.

Adds unit tests, fixes existing cron test.

Props tellyworth.

See [9181], #6966.
Fixes #28213.

Location:

trunk

Files:

• src/wp-includes/cron.php (modified) (1 diff)
• tests/phpunit/tests/cron.php (modified) (2 diffs)

trunk/src/wp-includes/cron.php

@@ -21 +21 @@
  */
 function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
-    // don't schedule a duplicate if there's already an identical event due in the next 10 minutes
+    // don't schedule a duplicate if there's already an identical event due within 10 minutes of it
     $next = wp_next_scheduled($hook, $args);
-    if ( $next && $next <= $timestamp + 10 * MINUTE_IN_SECONDS )
-        return;
+    if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
+        return;
+    }
 
     $crons = _get_cron_array();

trunk/tests/phpunit/tests/cron.php

@@ -215 +215 @@
         // duplicate events far apart should work normally
         $hook = rand_str();
-        $args = array(rand_str());
-        $ts1 = strtotime('+30 minutes');
-        $ts2 = strtotime('+3 minutes');
+        $args = array( rand_str() );
+        $ts1 = strtotime( '+30 minutes' );
+        $ts2 = strtotime( '+3 minutes' );
 
         // first one works
@@ -224 +224 @@
         wp_schedule_single_event( $ts2, $hook, $args );
 
-        // the next event should be at +5 minutes, not +3
-        $this->assertEquals( $ts2, wp_next_scheduled($hook, $args) );
+        // the next event should be at +3 minutes, even though that one was scheduled second
+        $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );
         wp_unschedule_event( $ts2, $hook, $args );
+        // following event at +30 minutes should be there too
+        $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );
+    }
+
+    function test_not_duplicate_event_reversed() {
+        // duplicate events far apart should work normally regardless of order
+        $hook = rand_str();
+        $args = array( rand_str() );
+        $ts1 = strtotime( '+3 minutes' );
+        $ts2 = strtotime( '+30 minutes' );
+
+        // first one works
+        wp_schedule_single_event( $ts1, $hook, $args );
+        // second works too
+        wp_schedule_single_event( $ts2, $hook, $args );
+
+        // the next event should be at +3 minutes
+        $this->assertEquals( $ts1, wp_next_scheduled( $hook, $args ) );
+        wp_unschedule_event( $ts1, $hook, $args );
         // following event should be there too
-        $this->assertEquals( $ts1, wp_next_scheduled($hook, $args) );
+        $this->assertEquals( $ts2, wp_next_scheduled( $hook, $args ) );
     }
 }