WordPress 3.8.3

[autoinstalls/wordpress.git] / wp-includes / cron.php

diff --git a/wp-includes/cron.php b/wp-includes/cron.php
index 6668dc546e292ce77f9d859762d1798451340b48..cd39a0899ec6e7503854c5cde8e59e76abf174d3 100644 (file)
--- a/wp-includes/cron.php
+++ b/wp-includes/cron.php
@@ -27,7 +27,14 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
 
        $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 )
@@ -68,7 +75,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 )
@@ -160,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 ) )
-               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 );
+               }
+       }
 }
 
 /**
@@ -244,10 +263,34 @@ function spawn_cron( $gmt_time = 0 ) {
        $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 to sslverify. Default true.
+        *     }
+        * }
+        */
        $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-http.php */
+                       'sslverify' => apply_filters( 'https_local_ssl_verify', true )
+               )
        ) );
 
        wp_remote_post( $cron_request['url'], $cron_request['args'] );
@@ -322,6 +365,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 );
 }