X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/42aebe6945a3a60c8f73853bea2c8b202d64a20b..refs/tags/wordpress-4.4:/wp-includes/cron.php?ds=sidebyside
diff --git a/wp-includes/cron.php b/wp-includes/cron.php
index 1c68e146..60492c5d 100644
--- a/wp-includes/cron.php
+++ b/wp-includes/cron.php
@@ -13,21 +13,35 @@
* WordPress site, if the schedule time has passed.
*
* @since 2.1.0
- * @link http://codex.wordpress.org/Function_Reference/wp_schedule_single_event
+ * @link https://codex.wordpress.org/Function_Reference/wp_schedule_single_event
*
* @param int $timestamp Timestamp for when to run the event.
* @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function.
+ * @return false|void False when an event is not scheduled.
*/
function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
- // don't schedule a duplicate if there's already an identical event due in the next 10 minutes
+ // Make sure timestamp is a positive integer
+ if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+ return false;
+ }
+
+ // Don't schedule a duplicate if there's already an identical event due within 10 minutes of it
$next = wp_next_scheduled($hook, $args);
- if ( $next && $next <= $timestamp + 10 * MINUTE_IN_SECONDS )
- return;
+ if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
+ return false;
+ }
$crons = _get_cron_array();
$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
- $event = apply_filters('schedule_event', $event);
+ /**
+ * Filter a single event before it is scheduled.
+ *
+ * @since 3.1.0
+ *
+ * @param object $event An object containing an event's data.
+ */
+ $event = apply_filters( 'schedule_event', $event );
// A plugin disallowed this event
if ( ! $event )
@@ -58,9 +72,14 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
* @param string $recurrence How often the event should recur.
* @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return bool|null False on failure, null when complete with scheduling event.
+ * @return false|void False when an event is not scheduled.
*/
function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+ // Make sure timestamp is a positive integer
+ if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+ return false;
+ }
+
$crons = _get_cron_array();
$schedules = wp_get_schedules();
@@ -68,7 +87,8 @@ function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
return false;
$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
- $event = apply_filters('schedule_event', $event);
+ /** This filter is documented in wp-includes/cron.php */
+ $event = apply_filters( 'schedule_event', $event );
// A plugin disallowed this event
if ( ! $event )
@@ -90,30 +110,39 @@ function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
* @param string $recurrence How often the event should recur.
* @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return bool|null False on failure. Null when event is rescheduled.
+ * @return false|void False when an event is not scheduled.
*/
-function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
+ // Make sure timestamp is a positive integer
+ if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+ return false;
+ }
+
$crons = _get_cron_array();
$schedules = wp_get_schedules();
- $key = md5(serialize($args));
+ $key = md5( serialize( $args ) );
$interval = 0;
// First we try to get it from the schedule
- if ( 0 == $interval )
- $interval = $schedules[$recurrence]['interval'];
+ if ( isset( $schedules[ $recurrence ] ) ) {
+ $interval = $schedules[ $recurrence ]['interval'];
+ }
// Now we try to get it from the saved interval in case the schedule disappears
- if ( 0 == $interval )
- $interval = $crons[$timestamp][$hook][$key]['interval'];
+ if ( 0 == $interval ) {
+ $interval = $crons[ $timestamp ][ $hook ][ $key ]['interval'];
+ }
// Now we assume something is wrong and fail to schedule
- if ( 0 == $interval )
+ if ( 0 == $interval ) {
return false;
+ }
$now = time();
- if ( $timestamp >= $now )
+ if ( $timestamp >= $now ) {
$timestamp = $now + $interval;
- else
- $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
+ } else {
+ $timestamp = $now + ( $interval - ( ( $now - $timestamp ) % $interval ) );
+ }
wp_schedule_event( $timestamp, $recurrence, $hook, $args );
}
@@ -132,8 +161,14 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array()) {
* Although not passed to a callback function, these arguments are used
* to uniquely identify the scheduled event, so they should be the same
* as those used when originally scheduling the event.
+ * @return false|void False when an event is not unscheduled.
*/
function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
+ // Make sure timestamp is a positive integer
+ if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+ return false;
+ }
+
$crons = _get_cron_array();
$key = md5(serialize($args));
unset( $crons[$timestamp][$hook][$key] );
@@ -182,7 +217,7 @@ function wp_clear_scheduled_hook( $hook, $args = array() ) {
*
* @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return bool|int The UNIX timestamp of the next time the scheduled event will occur.
+ * @return false|int The UNIX timestamp of the next time the scheduled event will occur.
*/
function wp_next_scheduled( $hook, $args = array() ) {
$crons = _get_cron_array();
@@ -200,11 +235,8 @@ function wp_next_scheduled( $hook, $args = array() ) {
* Send request to run cron through HTTP request that doesn't halt page loading.
*
* @since 2.1.0
- *
- * @return null Cron could not be spawned, because it is not needed to run.
*/
function spawn_cron( $gmt_time = 0 ) {
-
if ( ! $gmt_time )
$gmt_time = microtime( true );
@@ -212,9 +244,12 @@ function spawn_cron( $gmt_time = 0 ) {
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
- */
+ * Get the cron lock, which is a unix timestamp of when the last cron was spawned
+ * and has not finished running.
+ *
+ * Multiple processes on multiple web servers can run this code concurrently,
+ * this lock attempts to make spawning as atomic as possible.
+ */
$lock = get_transient('doing_cron');
if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
@@ -233,9 +268,10 @@ function spawn_cron( $gmt_time = 0 ) {
if ( isset($keys[0]) && $keys[0] > $gmt_time )
return;
- if ( defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON ) {
- if ( !empty($_POST) || defined('DOING_AJAX') )
+ if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
+ if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) || defined( 'XMLRPC_REQUEST' ) ) {
return;
+ }
$doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron );
@@ -252,13 +288,38 @@ function spawn_cron( $gmt_time = 0 ) {
return;
}
+ // Set the cron lock with the current unix timestamp, when the cron is being spawned.
$doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron );
+ /**
+ * Filter the cron request arguments.
+ *
+ * @since 3.5.0
+ *
+ * @param array $cron_request_array {
+ * An array of cron request URL arguments.
+ *
+ * @type string $url The cron request URL.
+ * @type int $key The 22 digit GMT microtime.
+ * @type array $args {
+ * An array of cron request arguments.
+ *
+ * @type int $timeout The request timeout in seconds. Default .01 seconds.
+ * @type bool $blocking Whether to set blocking for the request. Default false.
+ * @type bool $sslverify Whether SSL should be verified for the request. Default false.
+ * }
+ * }
+ */
$cron_request = apply_filters( 'cron_request', array(
- 'url' => site_url( 'wp-cron.php?doing_wp_cron=' . $doing_wp_cron ),
- 'key' => $doing_wp_cron,
- 'args' => array( 'timeout' => 0.01, 'blocking' => false, 'sslverify' => apply_filters( 'https_local_ssl_verify', true ) )
+ 'url' => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
+ 'key' => $doing_wp_cron,
+ 'args' => array(
+ 'timeout' => 0.01,
+ 'blocking' => false,
+ /** This filter is documented in wp-includes/class-wp-http-streams.php */
+ 'sslverify' => apply_filters( 'https_local_ssl_verify', false )
+ )
) );
wp_remote_post( $cron_request['url'], $cron_request['args'] );
@@ -268,11 +329,8 @@ function spawn_cron( $gmt_time = 0 ) {
* Run scheduled callbacks or spawn cron for all scheduled events.
*
* @since 2.1.0
- *
- * @return null When doesn't need to run Cron.
*/
function wp_cron() {
-
// Prevent infinite loops caused by lack of wp-cron.php
if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
return;
@@ -311,17 +369,17 @@ function wp_cron() {
* 60*60*24*7 or 604800. The value of 'interval' would then be 604800.
*
* The 'display' is the description. For the 'weekly' key, the 'display' would
- * be __('Once Weekly').
+ * be `__( 'Once Weekly' )`.
*
* For your plugin, you will be passed an array. you can easily add your
* schedule by doing the following.
- *
- * // filter parameter variable name is 'array'
- * $array['weekly'] = array(
- * 'interval' => 604800,
- * 'display' => __('Once Weekly')
- * );
- *
+ *
+ * // Filter parameter variable name is 'array'.
+ * $array['weekly'] = array(
+ * 'interval' => 604800,
+ * 'display' => __( 'Once Weekly' )
+ * );
+ *
*
* @since 2.1.0
*
@@ -333,6 +391,13 @@ function wp_get_schedules() {
'twicedaily' => array( 'interval' => 12 * HOUR_IN_SECONDS, 'display' => __( 'Twice Daily' ) ),
'daily' => array( 'interval' => DAY_IN_SECONDS, 'display' => __( 'Once Daily' ) ),
);
+ /**
+ * Filter the non-default cron schedules.
+ *
+ * @since 2.1.0
+ *
+ * @param array $new_schedules An array of non-default cron schedules. Default empty.
+ */
return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
}
@@ -343,7 +408,7 @@ function wp_get_schedules() {
*
* @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return string|bool False, if no schedule. Schedule on success.
+ * @return string|false False, if no schedule. Schedule on success.
*/
function wp_get_schedule($hook, $args = array()) {
$crons = _get_cron_array();
@@ -367,7 +432,7 @@ function wp_get_schedule($hook, $args = array()) {
* @since 2.1.0
* @access private
*
- * @return array CRON info array.
+ * @return false|array CRON info array.
*/
function _get_cron_array() {
$cron = get_option('cron');