Skip to content

Commit

Permalink
Use $gmt_time rather than $local_time in cron, since it uses GMT/UTC …
Browse files Browse the repository at this point in the history
…and not a local timestamp. see #14391.

git-svn-id: http://core.svn.wordpress.org/trunk@21954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
nacin committed Sep 23, 2012
1 parent 29b7d26 commit b45c550
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions wp-cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ function _get_cron_lock() {
die();

$keys = array_keys( $crons );
$local_time = microtime( true );
$gmt_time = microtime( true );

if ( isset($keys[0]) && $keys[0] > $local_time )
if ( isset($keys[0]) && $keys[0] > $gmt_time )
die();

$doing_cron_transient = get_transient( 'doing_cron');
Expand All @@ -59,7 +59,7 @@ function _get_cron_lock() {
if ( empty( $doing_wp_cron ) ) {
if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
// Called from external script/job. Try setting a lock.
if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $local_time ) )
if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
return;
$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
set_transient( 'doing_cron', $doing_wp_cron );
Expand All @@ -73,7 +73,7 @@ function _get_cron_lock() {
return;

foreach ( $crons as $timestamp => $cronhooks ) {
if ( $timestamp > $local_time )
if ( $timestamp > $gmt_time )
break;

foreach ( $cronhooks as $hook => $keys ) {
Expand Down
24 changes: 12 additions & 12 deletions wp-includes/cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
function spawn_cron( $local_time = 0 ) {
function spawn_cron( $gmt_time = 0 ) {

if ( ! $local_time )
$local_time = microtime( true );
if ( ! $gmt_time )
$gmt_time = microtime( true );

if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
return;
Expand All @@ -206,11 +206,11 @@ function spawn_cron( $local_time = 0 ) {
*/
$lock = get_transient('doing_cron');

if ( $lock > $local_time + 10*60 )
if ( $lock > $gmt_time + 10*60 )
$lock = 0;

// don't run if another process is currently running it or more than once every 60 sec.
if ( $lock + WP_CRON_LOCK_TIMEOUT > $local_time )
if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
return;

//sanity check
Expand All @@ -219,14 +219,14 @@ function spawn_cron( $local_time = 0 ) {
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;

$doing_wp_cron = sprintf( '%.22F', $local_time );
$doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron );

ob_start();
Expand All @@ -241,7 +241,7 @@ function spawn_cron( $local_time = 0 ) {
return;
}

$doing_wp_cron = sprintf( '%.22F', $local_time );
$doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron );

$cron_request = apply_filters( 'cron_request', array(
Expand Down Expand Up @@ -269,18 +269,18 @@ function wp_cron() {
if ( false === $crons = _get_cron_array() )
return;

$local_time = microtime( true );
$gmt_time = microtime( true );
$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 ) {
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;
spawn_cron( $local_time );
spawn_cron( $gmt_time );
break 2;
}
}
Expand Down

0 comments on commit b45c550

Please sign in to comment.