Unschedule event with wrong recurrence instead of rescheduling it

ampproject · Oct 13, 2021 · bf25b0c · bf25b0c
1 parent 422d0f2
commit bf25b0c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/BackgroundTask/RecurringBackgroundTask.php b/src/BackgroundTask/RecurringBackgroundTask.php
@@ -41,9 +41,13 @@ final public function schedule_event( ...$args ) {
 
 		$scheduled_event = wp_get_scheduled_event( $event_name, $args );
 
+		// Unschedule any existing event which had a differing recurrence.
 		if ( $scheduled_event && $scheduled_event->schedule !== $recurrence ) {
-			wp_schedule_event( $scheduled_event->timestamp, $recurrence, $event_name, $args );
-		} elseif ( ! $scheduled_event ) {
+			wp_unschedule_event( $scheduled_event->timestamp, $event_name, $args );
+			$scheduled_event = null;
+		}
+
+		if ( ! $scheduled_event ) {
 			wp_schedule_event( time(), $recurrence, $event_name, $args );
 		}
 	}