<!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>[36184] branches: Background Updates: Remove the 7am/7pm background update check.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36184">36184</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36184","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-06 12:23:15 +0000 (Wed, 06 Jan 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Background Updates: Remove the 7am/7pm background update check.
This changeset is a more basic version of <a href="https://core.trac.wordpress.org/changeset/36180">[36180]</a>, clearing the extra now redundant schedule.
As the functionality for this was introduced in 3.9, <a href="https://core.trac.wordpress.org/changeset/28129">[28129]</a> has been backported to 3.7/3.8, allowing the API TTL to be respected by those versions.
See <a href="https://core.trac.wordpress.org/ticket/27772">#27772</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/35323">#35323</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpincludesupdatephp">branches/3.7/src/wp-includes/update.php</a></li>
<li><a href="#branches38srcwpincludesupdatephp">branches/3.8/src/wp-includes/update.php</a></li>
<li><a href="#branches39srcwpincludesupdatephp">branches/3.9/src/wp-includes/update.php</a></li>
<li><a href="#branches40srcwpincludesupdatephp">branches/4.0/src/wp-includes/update.php</a></li>
<li><a href="#branches41srcwpincludesupdatephp">branches/4.1/src/wp-includes/update.php</a></li>
<li><a href="#branches42srcwpincludesupdatephp">branches/4.2/src/wp-includes/update.php</a></li>
<li><a href="#branches43srcwpincludesupdatephp">branches/4.3/src/wp-includes/update.php</a></li>
<li><a href="#branches44srcwpincludesupdatephp">branches/4.4/src/wp-includes/update.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
<li><a href="#branches37src">branches/3.7/src/</a></li>
<li><a href="#branches38">branches/3.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/3.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/3.7 2016-01-06 08:09:51 UTC (rev 36183)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.7 2016-01-06 12:23:15 UTC (rev 36184)
</ins><a id="branches37"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.8:27917,27920,27976,28073,28075-28076
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.9:29384,29386,29408,30452
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.2:33499
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26148-26149,26186,26304-26305,26448-26449,26734,26782,26927,27872,27905-27906,27928,27964,27975,27990,28053,28113,29327,29378,29381-29382,29397,29404,29631,30412,30417,30425,30430,30438,30443,30458,30466
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26014,26016-26017,26148-26149,26186,26304-26305,26448-26449,26734,26782,26927,27872,27905-27906,27928,27964,27975,27990,28053,28113,28129,29327,29378,29381-29382,29397,29404,29631,30412,30417,30425,30430,30438,30443,30458,30466
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><span class="cx" style="display: block; padding: 0 10px">Index: branches/3.7/src
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/3.7/src 2016-01-06 08:09:51 UTC (rev 36183)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.7/src 2016-01-06 12:23:15 UTC (rev 36184)
</ins><a id="branches37src"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.7/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3/src:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4/src:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.2/src:33499
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26149,26449,27906,27928,28113
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956,25974-25975,25977,25986,26149,26449,27906,27928,28113,28129
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches37srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.7/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.7/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/3.7/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $body['translations'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $updates->translations = $body['translations'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_site_transient( 'update_core', $updates);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_site_transient( 'update_core', $updates );
+
+ if ( ! empty( $body['ttl'] ) ) {
+ $ttl = (int) $body['ttl'];
+ if ( $ttl && ( time() + $ttl < wp_next_scheduled( 'wp_version_check' ) ) ) {
+ // Queue an event to re-run the update check in $ttl seconds.
+ wp_schedule_single_event( time() + $ttl, 'wp_version_check' );
+ }
+ }
+
+ // Trigger background updates if running non-interactively, and we weren't called from the update handler.
+ if ( defined( 'DOING_CRON' ) && DOING_CRON && 'wp_maybe_auto_update' != current_filter() ) {
+ do_action( 'wp_maybe_auto_update' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +210,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timeout = HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timeout = 12 * HOUR_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 0;
+ } else {
+ $timeout = 12 * HOUR_IN_SECONDS;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +361,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timeout = HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timeout = 12 * HOUR_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 0;
+ } else {
+ $timeout = 12 * HOUR_IN_SECONDS;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,19 +606,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
</span><span class="cx" style="display: block; padding: 0 10px">Index: branches/3.8
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/3.8 2016-01-06 08:09:51 UTC (rev 36183)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/3.8 2016-01-06 12:23:15 UTC (rev 36184)
</ins></span></pre></div>
<a id="branches38"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/3.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.9:29384,29408,30452
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.2:33499
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999,27006-27007,27012,27021,27119,27134,27511,27760,27822,27872,27905-27906,27928,27964,27975,27990,28053,28113,29327,29378,29381-29382,29397,29404,29631,30412,30417,30425,30430,30435,30438,30443,30458,30466
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:26864,26874-26875,26885,26887-26888,26905,26919-26925,26928-26929,26932,26935,26952,26959,26961,26967,26970,26993,26999,27006-27007,27012,27021,27119,27134,27511,27760,27822,27872,27905-27906,27928,27964,27975,27990,28053,28113,28129,29327,29378,29381-29382,29397,29404,29631,30412,30417,30425,30430,30435,30438,30443,30458,30466
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches38srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.8/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.8/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/3.8/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $body['translations'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $updates->translations = $body['translations'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_site_transient( 'update_core', $updates);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_site_transient( 'update_core', $updates );
+
+ if ( ! empty( $body['ttl'] ) ) {
+ $ttl = (int) $body['ttl'];
+ if ( $ttl && ( time() + $ttl < wp_next_scheduled( 'wp_version_check' ) ) ) {
+ // Queue an event to re-run the update check in $ttl seconds.
+ wp_schedule_single_event( time() + $ttl, 'wp_version_check' );
+ }
+ }
+
+ // Trigger background updates if running non-interactively, and we weren't called from the update handler.
+ if ( defined( 'DOING_CRON' ) && DOING_CRON && 'wp_maybe_auto_update' != current_filter() ) {
+ do_action( 'wp_maybe_auto_update' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +218,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timeout = HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timeout = 12 * HOUR_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 0;
+ } else {
+ $timeout = 12 * HOUR_IN_SECONDS;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +369,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timeout = HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timeout = 12 * HOUR_IN_SECONDS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ $timeout = 0;
+ } else {
+ $timeout = 12 * HOUR_IN_SECONDS;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,19 +614,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
</span></span></pre></div>
<a id="branches39srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/3.9/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,19 +611,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
</span></span></pre></div>
<a id="branches40srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/4.0/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,19 +633,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
</span></span></pre></div>
<a id="branches41srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/4.1/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,19 +633,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches42srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.2/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.2/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/4.2/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,19 +633,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches43srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/4.3/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -645,19 +645,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! defined( 'WP_INSTALLING' ) ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! defined('WP_INSTALLING') )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches44srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-includes/update.php 2016-01-06 08:09:51 UTC (rev 36183)
+++ branches/4.4/src/wp-includes/update.php 2016-01-06 12:23:15 UTC (rev 36184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,19 +646,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_next_scheduled( 'wp_maybe_auto_update' ) && ! wp_installing() ) {
- // Schedule auto updates for 7 a.m. and 7 p.m. in the timezone of the site.
- $next = strtotime( 'today 7am' );
- $now = time();
- // Find the next instance of 7 a.m. or 7 p.m., but skip it if it is within 3 hours from now.
- while ( ( $now + 3 * HOUR_IN_SECONDS ) > $next ) {
- $next += 12 * HOUR_IN_SECONDS;
- }
- $next = $next - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
- // Add a random number of minutes, so we don't have all sites trying to update exactly on the hour
- $next = $next + rand( 0, 59 ) * MINUTE_IN_SECONDS;
- wp_schedule_event( $next, 'twicedaily', 'wp_maybe_auto_update' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( wp_next_scheduled( 'wp_maybe_auto_update' ) > ( time() + HOUR_IN_SECONDS ) ) && ! wp_installing() )
+ wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>