site_iri: comparison web/wp-includes/cron.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 	$next = wp_next_scheduled($hook, $args);
 	if ( $next && $next <= $timestamp + 600 )
 		return;
 	$crons = _get_cron_array();
-	$key = md5(serialize($args));
+	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
-	$crons[$timestamp][$hook][$key] = array( 'schedule' => false, 'args' => $args );
+	$event = apply_filters('schedule_event', $event);
+	// A plugin disallowed this event
+	if ( ! $event )
+		return false;
+	$key = md5(serialize($event->args));
+	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args );
 	uksort( $crons, "strnatcasecmp" );
 	_set_cron_array( $crons );
 }
 /**
 *
 * Schedules a hook which will be executed by the WordPress actions core on a
 * specific interval, specified by you. The action will trigger when someone
 * visits your WordPress site, if the scheduled time has passed.
 *
-* Valid values for the recurrence are hourly, daily and twicedaily.  These can
+* Valid values for the recurrence are hourly, daily and twicedaily. These can
 * be extended using the cron_schedules filter in wp_get_schedules().
+*
+* Use wp_next_scheduled() to prevent duplicates
 *
 * @since 2.1.0
 *
 * @param int $timestamp Timestamp for when to run the event.
 * @param string $recurrence How often the event should recur.
 * @return bool|null False on failure, null when complete with scheduling event.
 */
 function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
 	$crons = _get_cron_array();
 	$schedules = wp_get_schedules();
-	$key = md5(serialize($args));
 	if ( !isset( $schedules[$recurrence] ) )
 		return false;
-	$crons[$timestamp][$hook][$key] = array( 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+	$event = apply_filters('schedule_event', $event);
+	// A plugin disallowed this event
+	if ( ! $event )
+		return false;
+	$key = md5(serialize($event->args));
+	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval );
 	uksort( $crons, "strnatcasecmp" );
 	_set_cron_array( $crons );
 }
 /**
 	if ( 0 == $interval )
 		return false;
 	$now = time();
-if ( $timestamp >= $now )
+	if ( $timestamp >= $now )
-$timestamp = $now + $interval;
+		$timestamp = $now + $interval;
-else
+	else
-$timestamp = $now + ($interval - (($now - $timestamp) % $interval));
+		$timestamp = $now + ($interval - (($now - $timestamp) % $interval));
 	wp_schedule_event( $timestamp, $recurrence, $hook, $args );
 }
 /**
 * Unschedule all cron jobs attached to a specific hook.
 *
 * @since 2.1.0
 *
 * @param string $hook Action hook, the execution of which will be unscheduled.
-* @param mixed $args,... Optional. Event arguments.
+* @param array $args Optional. Arguments that were to be pass to the hook's callback function.
 */
-function wp_clear_scheduled_hook( $hook ) {
+function wp_clear_scheduled_hook( $hook, $args = array() ) {
-	$args = array_slice( func_get_args(), 1 );
+	// Backward compatibility
+	// Previously this function took the arguments as discrete vars rather than an array like the rest of the API
+	if ( !is_array($args) ) {
+		_deprecated_argument( __FUNCTION__, '3.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
+		$args = array_slice( func_get_args(), 1 );
+	}
 	while ( $timestamp = wp_next_scheduled( $hook, $args ) )
 		wp_unschedule_event( $timestamp, $hook, $args );
 }
 *
 * @return null Cron could not be spawned, because it is not needed to run.
 */
 function spawn_cron( $local_time = 0 ) {
-	if ( !$local_time )
+	if ( ! $local_time )
-		$local_time = time();
+		$local_time = microtime( true );
 	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
-		return;
-	/*
-	 * do not even start the cron if local server timer has drifted
-	 * such as due to power failure, or misconfiguration
-	 */
-	$timer_accurate = check_server_timer( $local_time );
-	if ( !$timer_accurate )
 		return;
 	/*
 	* multiple processes on multiple web servers can run this code concurrently
 	* try to make this as atomic as possible by setting doing_cron switch
 	*/
-	$flag = get_transient('doing_cron');
+	$lock = get_transient('doing_cron');
-	if ( $flag > $local_time + 10*60 )
+	if ( $lock > $local_time + 10*60 )
-		$flag = 0;
+		$lock = 0;
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $flag + 60 > $local_time )
+	if ( $lock + WP_CRON_LOCK_TIMEOUT > $local_time )
 		return;
 	//sanity check
 	$crons = _get_cron_array();
 	if ( !is_array($crons) )
 	if ( defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON ) {
 		if ( !empty($_POST) || defined('DOING_AJAX') )
 			return;
-		set_transient( 'doing_cron', $local_time );
+		$doing_wp_cron = sprintf( '%.22F', $local_time );
+		set_transient( 'doing_cron', $doing_wp_cron );
 		ob_start();
-		wp_redirect( add_query_arg('doing_wp_cron', '', stripslashes($_SERVER['REQUEST_URI'])) );
+		wp_redirect( add_query_arg('doing_wp_cron', $doing_wp_cron, stripslashes($_SERVER['REQUEST_URI'])) );
 		echo ' ';
 		// flush any buffers and send the headers
 		while ( @ob_end_flush() );
 		flush();
-		@include_once(ABSPATH . 'wp-cron.php');
+		WP_DEBUG ? include_once( ABSPATH . 'wp-cron.php' ) : @include_once( ABSPATH . 'wp-cron.php' );
 		return;
 	}
-	set_transient( 'doing_cron', $local_time );
+	$doing_wp_cron = sprintf( '%.22F', $local_time );
+	set_transient( 'doing_cron', $doing_wp_cron );
-	$cron_url = get_option( 'siteurl' ) . '/wp-cron.php?doing_wp_cron';
-	wp_remote_post( $cron_url, array('timeout' => 0.01, 'blocking' => false, 'sslverify' => apply_filters('https_local_ssl_verify', true)) );
+	$cron_url = site_url( 'wp-cron.php?doing_wp_cron=' . $doing_wp_cron );
+	wp_remote_post( $cron_url, array( 'timeout' => 0.01, 'blocking' => false, 'sslverify' => apply_filters( 'https_local_ssl_verify', true ) ) );
 }
 /**
 * Run scheduled callbacks or spawn cron for all scheduled events.
 *
 		return;
 	if ( false === $crons = _get_cron_array() )
 		return;
-	$local_time = time();
+	$local_time = microtime( true );
 	$keys = array_keys( $crons );
 	if ( isset($keys[0]) && $keys[0] > $local_time )
 		return;
 	$schedules = wp_get_schedules();
 	$new_cron['version'] = 2;
 	update_option( 'cron', $new_cron );
 	return $new_cron;
 }
-// stub for checking server timer accuracy, using outside standard time sources
-function check_server_timer( $local_time ) {
-	return true;
-}

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b