Changeset 26782

Timestamp:

12/07/2013 09:12:51 AM (11 years ago)

Author:

dd32

Message:

Cron: Fix a case where a cache inconsistency can cause wp_clear_scheduled_hook() to enter an infinite loop. This unravels the function from using other cron api functions to looping over the cron array directly. See #25773

File:

• trunk/src/wp-includes/cron.php (modified) (1 diff)

trunk/src/wp-includes/cron.php

@@ -169 +169 @@
     }
 
-    while ( $timestamp = wp_next_scheduled( $hook, $args ) )
-        wp_unschedule_event( $timestamp, $hook, $args );
+    // This logic duplicates wp_next_scheduled()
+    // It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
+    // and, wp_next_scheduled() returns the same schedule in an infinite loop.
+    $crons = _get_cron_array();
+    if ( empty( $crons ) )
+        return;
+
+    $key = md5( serialize( $args ) );
+    foreach ( $crons as $timestamp => $cron ) {
+        if ( isset( $cron[ $hook ][ $key ] ) ) {
+            wp_unschedule_event( $timestamp, $hook, $args );
+        }
+    }
 }