<!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>[29349] trunk/src/wp-includes/cron.php: Avoid an undefined index notice in wp_reschedule_event().</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/29349">29349</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-08-01 20:56:11 +0000 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid an undefined index notice in wp_reschedule_event().
props paulschreiber.
fixes <a href="http://core.trac.wordpress.org/ticket/29077">#29077</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescronphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/cron.php (29348 => 29349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/cron.php 2014-08-01 20:43:26 UTC (rev 29348)
+++ trunk/src/wp-includes/cron.php 2014-08-01 20:56:11 UTC (rev 29349)
</span><span class="lines">@@ -100,28 +100,32 @@
</span><span class="cx"> * @param array $args Optional. Arguments to pass to the hook's callback function.
</span><span class="cx"> * @return bool|null False on failure. Null when event is rescheduled.
</span><span class="cx"> */
</span><del>-function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array()) {
</del><ins>+function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
</ins><span class="cx"> $crons = _get_cron_array();
</span><span class="cx"> $schedules = wp_get_schedules();
</span><del>- $key = md5(serialize($args));
</del><ins>+ $key = md5( serialize( $args ) );
</ins><span class="cx"> $interval = 0;
</span><span class="cx">
</span><span class="cx"> // First we try to get it from the schedule
</span><del>- if ( 0 == $interval )
- $interval = $schedules[$recurrence]['interval'];
</del><ins>+ if ( isset( $schedules[ $recurrence ] ) ) {
+ $interval = $schedules[ $recurrence ]['interval'];
+ }
</ins><span class="cx"> // Now we try to get it from the saved interval in case the schedule disappears
</span><del>- if ( 0 == $interval )
- $interval = $crons[$timestamp][$hook][$key]['interval'];
</del><ins>+ if ( 0 == $interval ) {
+ $interval = $crons[ $timestamp ][ $hook ][ $key ]['interval'];
+ }
</ins><span class="cx"> // Now we assume something is wrong and fail to schedule
</span><del>- if ( 0 == $interval )
</del><ins>+ if ( 0 == $interval ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $now = time();
</span><span class="cx">
</span><del>- if ( $timestamp >= $now )
</del><ins>+ if ( $timestamp >= $now ) {
</ins><span class="cx"> $timestamp = $now + $interval;
</span><del>- else
- $timestamp = $now + ($interval - (($now - $timestamp) % $interval));
</del><ins>+ } else {
+ $timestamp = $now + ( $interval - ( ( $now - $timestamp ) % $interval ) );
+ }
</ins><span class="cx">
</span><span class="cx"> wp_schedule_event( $timestamp, $recurrence, $hook, $args );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>