<!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>[25466] trunk/src/wp-includes/update.php: WordPress Core Automatic Updates: Switch to a twicedaily cronjob to match the update check cron jobs, this removes the ability for update checks to continuously re-queue a upgrade job.</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/25466">25466</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-09-17 02:25:17 +0000 (Tue, 17 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordPress Core Automatic Updates: Switch to a twicedaily cronjob to match the update check cron jobs, this removes the ability for update checks to continuously re-queue a upgrade job. See <a href="http://core.trac.wordpress.org/ticket/22704">#22704</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/update.php (25465 => 25466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/update.php 2013-09-16 22:11:12 UTC (rev 25465)
+++ trunk/src/wp-includes/update.php 2013-09-17 02:25:17 UTC (rev 25466)
</span><span class="lines">@@ -120,8 +120,6 @@
</span><span class="cx"> $updates->last_checked = time();
</span><span class="cx"> $updates->version_checked = $wp_version;
</span><span class="cx"> set_site_transient( 'update_core', $updates);
</span><del>-
- wp_auto_updates_maybe_queue( 'core' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -223,8 +221,6 @@
</span><span class="cx"> $new_option->response = array();
</span><span class="cx">
</span><span class="cx"> set_site_transient( 'update_plugins', $new_option );
</span><del>-
- wp_auto_updates_maybe_queue( 'plugins' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -335,46 +331,14 @@
</span><span class="cx"> $new_update->response = $response;
</span><span class="cx">
</span><span class="cx"> set_site_transient( 'update_themes', $new_update );
</span><del>-
- wp_auto_updates_maybe_queue( 'themes' );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Queues a cron entry if a potentially upgrade is detected.
</del><ins>+ * Cron entry which runs the WordPress Automatic Updates
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.7.0
</span><del>- *
- * @param string $type The type of update to check for, may be 'core', 'plugins', or, 'themes'.
</del><span class="cx"> */
</span><del>-function wp_auto_updates_maybe_queue( $type = 'core' ) {
- include_once ABSPATH . '/wp-admin/includes/class-wp-upgrader.php';
- include_once ABSPATH . '/wp-admin/includes/update.php';
-
- if ( WP_Automatic_Upgrader::upgrader_disabled() )
- return;
-
- $updates_available = false;
- if ( 'core' == $type ) {
- $updates_available = (bool) find_core_auto_update();
- } elseif ( 'plugins' == $type ) {
- $plugin_updates = get_site_transient( 'update_plugins' );
- $updates_available = !empty( $plugin_updates->response );
- } elseif ( 'themes' == $type ) {
- $theme_updates = get_site_transient( 'update_themes' );
- $updates_available = empty( $theme_updates->response );
- }
-
- if ( $updates_available && ! wp_next_scheduled( 'wp_auto_updates_execute' ) ) {
- // If the transient update was triggered by a user pageview, update in an hours time, else, now.
- $when_to_update = get_current_user_id() ? time() + HOUR_IN_SECONDS : time();
- $when_to_update = apply_filters( 'auto_upgrade_when_to_upgrade', $when_to_update );
-
- wp_schedule_single_event( $when_to_update, 'wp_auto_updates_execute' );
- }
-
-}
-
-function wp_auto_updates_execute() {
</del><ins>+function wp_auto_updates_maybe_update() {
</ins><span class="cx"> include_once ABSPATH . '/wp-admin/includes/admin.php';
</span><span class="cx"> include_once ABSPATH . '/wp-admin/includes/class-wp-upgrader.php';
</span><span class="cx">
</span><span class="lines">@@ -487,6 +451,10 @@
</span><span class="cx">
</span><span class="cx"> if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
</span><span class="cx"> wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
</span><ins>+
+ if ( !wp_next_scheduled( 'wp_auto_updates_maybe_update' ) && ! defined( 'WP_INSTALLING' ) )
+ wp_schedule_event( time(), 'twicedaily', 'wp_auto_updates_maybe_update' );
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
</span><span class="lines">@@ -508,6 +476,6 @@
</span><span class="cx"> add_action( 'wp_update_themes', 'wp_update_themes' );
</span><span class="cx">
</span><span class="cx"> // Automatic Updates - Cron callback
</span><del>-add_action( 'wp_auto_updates_execute', 'wp_auto_updates_execute' );
</del><ins>+add_action( 'wp_auto_updates_maybe_update', 'wp_auto_updates_maybe_update' );
</ins><span class="cx">
</span><span class="cx"> add_action('init', 'wp_schedule_update_checks');
</span></span></pre>
</div>
</div>
</body>
</html>