<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21954] trunk: Use $gmt_time rather than $local_time in cron, since it uses GMT/UTC and not a local timestamp.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21954">21954</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-23 16:57:21 +0000 (Sun, 23 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use $gmt_time rather than $local_time in cron, since it uses GMT/UTC and not a local timestamp. see <a href="http://core.trac.wordpress.org/ticket/14391">#14391</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcronphp">trunk/wp-cron.php</a></li>
<li><a href="#trunkwpincludescronphp">trunk/wp-includes/cron.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-cron.php (21953 => 21954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-cron.php 2012-09-22 16:21:06 UTC (rev 21953)
+++ trunk/wp-cron.php 2012-09-23 16:57:21 UTC (rev 21954)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> die();
</span><span class="cx">
</span><span class="cx"> $keys = array_keys( $crons );
</span><del>-$local_time = microtime( true );
</del><ins>+$gmt_time = microtime( true );
</ins><span class="cx">
</span><del>-if ( isset($keys[0]) && $keys[0] > $local_time )
</del><ins>+if ( isset($keys[0]) && $keys[0] > $gmt_time )
</ins><span class="cx"> die();
</span><span class="cx">
</span><span class="cx"> $doing_cron_transient = get_transient( 'doing_cron');
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if ( empty( $doing_wp_cron ) ) {
</span><span class="cx"> if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
</span><span class="cx"> // Called from external script/job. Try setting a lock.
</span><del>- if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $local_time ) )
</del><ins>+ if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
</ins><span class="cx"> return;
</span><span class="cx"> $doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
</span><span class="cx"> set_transient( 'doing_cron', $doing_wp_cron );
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> foreach ( $crons as $timestamp => $cronhooks ) {
</span><del>- if ( $timestamp > $local_time )
</del><ins>+ if ( $timestamp > $gmt_time )
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> foreach ( $cronhooks as $hook => $keys ) {
</span></span></pre></div>
<a id="trunkwpincludescronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cron.php (21953 => 21954)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cron.php 2012-09-22 16:21:06 UTC (rev 21953)
+++ trunk/wp-includes/cron.php 2012-09-23 16:57:21 UTC (rev 21954)
</span><span class="lines">@@ -192,10 +192,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @return null Cron could not be spawned, because it is not needed to run.
</span><span class="cx"> */
</span><del>-function spawn_cron( $local_time = 0 ) {
</del><ins>+function spawn_cron( $gmt_time = 0 ) {
</ins><span class="cx">
</span><del>- if ( ! $local_time )
- $local_time = microtime( true );
</del><ins>+ if ( ! $gmt_time )
+ $gmt_time = microtime( true );
</ins><span class="cx">
</span><span class="cx"> if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
</span><span class="cx"> return;
</span><span class="lines">@@ -206,11 +206,11 @@
</span><span class="cx"> */
</span><span class="cx"> $lock = get_transient('doing_cron');
</span><span class="cx">
</span><del>- if ( $lock > $local_time + 10*60 )
</del><ins>+ if ( $lock > $gmt_time + 10*60 )
</ins><span class="cx"> $lock = 0;
</span><span class="cx">
</span><span class="cx"> // don't run if another process is currently running it or more than once every 60 sec.
</span><del>- if ( $lock + WP_CRON_LOCK_TIMEOUT > $local_time )
</del><ins>+ if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> //sanity check
</span><span class="lines">@@ -219,14 +219,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $keys = array_keys( $crons );
</span><del>- if ( isset($keys[0]) && $keys[0] > $local_time )
</del><ins>+ if ( isset($keys[0]) && $keys[0] > $gmt_time )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( defined('ALTERNATE_WP_CRON') && ALTERNATE_WP_CRON ) {
</span><span class="cx"> if ( !empty($_POST) || defined('DOING_AJAX') )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $doing_wp_cron = sprintf( '%.22F', $local_time );
</del><ins>+ $doing_wp_cron = sprintf( '%.22F', $gmt_time );
</ins><span class="cx"> set_transient( 'doing_cron', $doing_wp_cron );
</span><span class="cx">
</span><span class="cx"> ob_start();
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $doing_wp_cron = sprintf( '%.22F', $local_time );
</del><ins>+ $doing_wp_cron = sprintf( '%.22F', $gmt_time );
</ins><span class="cx"> set_transient( 'doing_cron', $doing_wp_cron );
</span><span class="cx">
</span><span class="cx"> $cron_request = apply_filters( 'cron_request', array(
</span><span class="lines">@@ -269,18 +269,18 @@
</span><span class="cx"> if ( false === $crons = _get_cron_array() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $local_time = microtime( true );
</del><ins>+ $gmt_time = microtime( true );
</ins><span class="cx"> $keys = array_keys( $crons );
</span><del>- if ( isset($keys[0]) && $keys[0] > $local_time )
</del><ins>+ if ( isset($keys[0]) && $keys[0] > $gmt_time )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $schedules = wp_get_schedules();
</span><span class="cx"> foreach ( $crons as $timestamp => $cronhooks ) {
</span><del>- if ( $timestamp > $local_time ) break;
</del><ins>+ if ( $timestamp > $gmt_time ) break;
</ins><span class="cx"> foreach ( (array) $cronhooks as $hook => $args ) {
</span><span class="cx"> if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
</span><span class="cx"> continue;
</span><del>- spawn_cron( $local_time );
</del><ins>+ spawn_cron( $gmt_time );
</ins><span class="cx"> break 2;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>