Changeset 27886 for branches/3.7

Timestamp:

04/01/2014 03:39:35 AM (12 years ago)

Author:

nacin

Message:

Cron: Fix a case where a cache inconsistency can cause wp_clear_scheduled_hook() to enter an infinite loop.

Merges [26782] from 3.8 to the 3.7 branch.

props dd32.
fixes #25773.

Location:

branches/3.7

Files:

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

branches/3.7/src/wp-includes/cron.php

@@ -161 +161 @@
         }
 
-        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 );
+                }
+        }
 }