WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use $gmt_time rather than $local_time in cron, since it uses GMT/UTC and not a local timestamp. see #14391. 

git-svn-id: http://core.svn.wordpress.org/trunk@21954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-09-23 16:57:21 +00:00
parent 29b7d26ca5
commit b45c550376
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-cron.php
View File

@ -48,9 +48,9 @@ if ( false === $crons = _get_cron_array() )
die(); die();
$keys = array_keys( $crons ); $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(); die();
$doing_cron_transient = get_transient( 'doing_cron'); $doing_cron_transient = get_transient( 'doing_cron');
@ -59,7 +59,7 @@ $doing_cron_transient = get_transient( 'doing_cron');
if ( empty( $doing_wp_cron ) ) { if ( empty( $doing_wp_cron ) ) {
if ( empty( $_GET[ 'doing_wp_cron' ] ) ) { if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
// Called from external script/job. Try setting a lock. // 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; return;
$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) ); $doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
set_transient( 'doing_cron', $doing_wp_cron ); set_transient( 'doing_cron', $doing_wp_cron );
@ -73,7 +73,7 @@ if ( $doing_cron_transient != $doing_wp_cron )
return; return;
foreach ( $crons as $timestamp => $cronhooks ) { foreach ( $crons as $timestamp => $cronhooks ) {
if ( $timestamp > $local_time ) if ( $timestamp > $gmt_time )
break; break;
foreach ( $cronhooks as $hook => $keys ) { foreach ( $cronhooks as $hook => $keys ) {

24
wp-includes/cron.php
View File

@ -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 ) if ( ! $gmt_time )
$local_time = microtime( true ); $gmt_time = microtime( true );
if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) ) if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
return; return;
@ -206,11 +206,11 @@ function spawn_cron( $local_time = 0 ) {
*/ */
$lock = get_transient('doing_cron'); $lock = get_transient('doing_cron');
if ( $lock > $local_time + 10*60 ) if ( $lock > $gmt_time + 10*60 )
$lock = 0; $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 ( $lock + WP_CRON_LOCK_TIMEOUT > $local_time ) if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
return; return;
//sanity check //sanity check
@ -219,14 +219,14 @@ function spawn_cron( $local_time = 0 ) {
return; return;
$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; return;
if ( defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON ) { if ( defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON ) {
if ( !empty($_POST) || defined('DOING_AJAX') ) if ( !empty($_POST) || defined('DOING_AJAX') )
return; return;
$doing_wp_cron = sprintf( '%.22F', $local_time ); $doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron ); set_transient( 'doing_cron', $doing_wp_cron );
ob_start(); ob_start();
@ -241,7 +241,7 @@ function spawn_cron( $local_time = 0 ) {
return; return;
} }
$doing_wp_cron = sprintf( '%.22F', $local_time ); $doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron ); set_transient( 'doing_cron', $doing_wp_cron );
$cron_request = apply_filters( 'cron_request', array( $cron_request = apply_filters( 'cron_request', array(
@ -269,18 +269,18 @@ function wp_cron() {
if ( false === $crons = _get_cron_array() ) if ( false === $crons = _get_cron_array() )
return; return;
$local_time = microtime( true ); $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; return;
$schedules = wp_get_schedules(); $schedules = wp_get_schedules();
foreach ( $crons as $timestamp => $cronhooks ) { foreach ( $crons as $timestamp => $cronhooks ) {
if ( $timestamp > $local_time ) break; if ( $timestamp > $gmt_time ) break;
foreach ( (array) $cronhooks as $hook => $args ) { foreach ( (array) $cronhooks as $hook => $args ) {
if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) ) if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
continue; continue;
spawn_cron( $local_time ); spawn_cron( $gmt_time );
break 2; break 2;
} }
} }