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

Built from https://develop.svn.wordpress.org/trunk@26782


git-svn-id: http://core.svn.wordpress.org/trunk@26669 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/cron.php

@@ -168,8 +168,19 @@ function wp_clear_scheduled_hook( $hook, $args = array() ) {
 		$args = array_slice( func_get_args(), 1 );
 	}
 
-	while ( $timestamp = wp_next_scheduled( $hook, $args ) )
+	// This logic duplicates wp_next_scheduled()
-		wp_unschedule_event( $timestamp, $hook, $args );
+	// 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 );
+		}
+	}
 }
 
 /**