Wordpress 3.6-scripts

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

diff --git a/wp-includes/cron.php b/wp-includes/cron.php
index b7d04f2a2f56b4b633c4c81b135f583ea648d189..6668dc546e292ce77f9d859762d1798451340b48 100644 (file)
--- a/wp-includes/cron.php
+++ b/wp-includes/cron.php
@@ -22,7 +22,7 @@
 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
        $next = wp_next_scheduled($hook, $args);
 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
        $next = wp_next_scheduled($hook, $args);

-       if ( $next && $next <= $timestamp + 600 )
+       if ( $next && $next <= $timestamp + 10 * MINUTE_IN_SECONDS )

                return;
 
        $crons = _get_cron_array();
                return;
 
        $crons = _get_cron_array();


@@ -47,7 +47,7 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
  * specific interval, specified by you. The action will trigger when someone
  * visits your WordPress site, if the scheduled time has passed.
  *
  * 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
  * be extended using the cron_schedules filter in wp_get_schedules().
  *
  * Use wp_next_scheduled() to prevent duplicates


@@ -192,10 +192,10 @@ function wp_next_scheduled( $hook, $args = array() ) {
  *
  * @return null Cron could not be spawned, because it is not needed to run.
  */
  *
  * @return null Cron could not be spawned, because it is not needed to run.
  */

-function spawn_cron( $local_time = 0 ) {
+function spawn_cron( $gmt_time = 0 ) {

 
 

-       if ( !$local_time )
-               $local_time = time();
+       if ( ! $gmt_time )
+               $gmt_time = microtime( true );

 
        if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
                return;
 
        if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
                return;


@@ -204,13 +204,13 @@ function spawn_cron( $local_time = 0 ) {
        * multiple processes on multiple web servers can run this code concurrently
        * try to make this as atomic as possible by setting doing_cron switch
        */
        * 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 )
-               $flag = 0;
+       if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
+               $lock = 0;

 
        // don't run if another process is currently running it or more than once every 60 sec.
 
        // 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 > $gmt_time )

                return;
 
        //sanity check
                return;
 
        //sanity check


@@ -219,17 +219,18 @@ function spawn_cron( $local_time = 0 ) {
                return;
 
        $keys = array_keys( $crons );
                return;
 
        $keys = array_keys( $crons );

-       if ( isset($keys[0]) && $keys[0] > $local_time )
+       if ( isset($keys[0]) && $keys[0] > $gmt_time )

                return;
 
        if ( defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON ) {
                if ( !empty($_POST) || defined('DOING_AJAX') )
                        return;
 
                return;
 
        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', $gmt_time );
+               set_transient( 'doing_cron', $doing_wp_cron );

 
                ob_start();
 
                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, wp_unslash( $_SERVER['REQUEST_URI'] ) ) );

                echo ' ';
 
                // flush any buffers and send the headers
                echo ' ';
 
                // flush any buffers and send the headers


@@ -240,10 +241,16 @@ function spawn_cron( $local_time = 0 ) {
                return;
        }
 
                return;
        }
 

-       set_transient( 'doing_cron', $local_time );
+       $doing_wp_cron = sprintf( '%.22F', $gmt_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_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 ) )
+       ) );
+
+       wp_remote_post( $cron_request['url'], $cron_request['args'] );

 }
 
 /**
 }
 
 /**


@@ -262,18 +269,18 @@ function wp_cron() {
        if ( false === $crons = _get_cron_array() )
                return;
 
        if ( false === $crons = _get_cron_array() )
                return;
 

-       $local_time = time();
+       $gmt_time = microtime( true );

        $keys = array_keys( $crons );
        $keys = array_keys( $crons );

-       if ( isset($keys[0]) && $keys[0] > $local_time )
+       if ( isset($keys[0]) && $keys[0] > $gmt_time )

                return;
 
        $schedules = wp_get_schedules();
        foreach ( $crons as $timestamp => $cronhooks ) {
                return;
 
        $schedules = wp_get_schedules();
        foreach ( $crons as $timestamp => $cronhooks ) {

-               if ( $timestamp > $local_time ) break;
+               if ( $timestamp > $gmt_time ) break;

                foreach ( (array) $cronhooks as $hook => $args ) {
                        if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
                                continue;
                foreach ( (array) $cronhooks as $hook => $args ) {
                        if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
                                continue;

-                       spawn_cron( $local_time );
+                       spawn_cron( $gmt_time );

                        break 2;
                }
        }
                        break 2;
                }
        }


@@ -311,9 +318,9 @@ function wp_cron() {
  */
 function wp_get_schedules() {
        $schedules = array(
  */
 function wp_get_schedules() {
        $schedules = array(

-               'hourly' => array( 'interval' => 3600, 'display' => __('Once Hourly') ),
-               'twicedaily' => array( 'interval' => 43200, 'display' => __('Twice Daily') ),
-               'daily' => array( 'interval' => 86400, 'display' => __('Once Daily') ),
+               'hourly'     => array( 'interval' => HOUR_IN_SECONDS,      'display' => __( 'Once Hourly' ) ),
+               'twicedaily' => array( 'interval' => 12 * HOUR_IN_SECONDS, 'display' => __( 'Twice Daily' ) ),
+               'daily'      => array( 'interval' => DAY_IN_SECONDS,       'display' => __( 'Once Daily' ) ),

        );
        return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
 }
        );
        return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
 }