Changeset 21954

Timestamp:

09/23/2012 04:57:21 PM (12 years ago)

Author:

nacin

Message:

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

Location:

trunk

Files:

• wp-cron.php (modified) (3 diffs)
• wp-includes/cron.php (modified) (6 diffs)

trunk/wp-cron.php

@@ -49 +49 @@
 
 $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();
 
@@ -60 +60 @@
     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 ) );
@@ -74 +74 @@
 
 foreach ( $crons as $timestamp => $cronhooks ) {
-    if ( $timestamp > $local_time )
+    if ( $timestamp > $gmt_time )
         break;
 

trunk/wp-includes/cron.php

@@ -193 +193 @@
  * @return null Cron could not be spawned, because it is not needed to run.
  */
-function spawn_cron( $local_time = 0 ) {
-
-    if ( ! $local_time )
-        $local_time = microtime( true );
+function spawn_cron( $gmt_time = 0 ) {
+
+    if ( ! $gmt_time )
+        $gmt_time = microtime( true );
 
     if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
@@ -207 +207 @@
     $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;
 
@@ -220 +220 @@
 
     $keys = array_keys( $crons );
-    if ( isset($keys[0]) && $keys[0] > $local_time )
+    if ( isset($keys[0]) && $keys[0] > $gmt_time )
         return;
 
@@ -227 +227 @@
             return;
 
-        $doing_wp_cron = sprintf( '%.22F', $local_time );
+        $doing_wp_cron = sprintf( '%.22F', $gmt_time );
         set_transient( 'doing_cron', $doing_wp_cron );
 
@@ -242 +242 @@
     }
 
-    $doing_wp_cron = sprintf( '%.22F', $local_time );
+    $doing_wp_cron = sprintf( '%.22F', $gmt_time );
     set_transient( 'doing_cron', $doing_wp_cron );
 
@@ -270 +270 @@
         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;
         }