<!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>[40575] trunk/src: Cron API: Add a new `wp_doing_cron()` helper function.</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/40575">40575</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/40575","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-06 14:29:01 +0000 (Sat, 06 May 2017)</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'>Cron API: Add a new `wp_doing_cron()` helper function.
This replaces `DOING_CRON` checks via the constant.
Props tfrommen.
Fixes <a href="https://core.trac.wordpress.org/ticket/39591">#39591</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasspluginupgraderphp">trunk/src/wp-admin/includes/class-plugin-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasspluginupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-plugin-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-upgrader.php 2017-05-06 14:24:37 UTC (rev 40574)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader.php 2017-05-06 14:29:01 UTC (rev 40575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,7 +406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'DOING_CRON' ) && DOING_CRON )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_doing_cron() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2017-05-06 14:24:37 UTC (rev 40574)
+++ trunk/src/wp-admin/includes/file.php 2017-05-06 14:29:01 UTC (rev 40575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,7 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A disk that has zero free bytes has bigger problems.
</span><span class="cx" style="display: block; padding: 0 10px"> * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
</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 ( defined( 'DOING_CRON' ) && DOING_CRON ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_doing_cron() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $available_space = @disk_free_space( WP_CONTENT_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -769,7 +769,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A disk that has zero free bytes has bigger problems.
</span><span class="cx" style="display: block; padding: 0 10px"> * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
</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 ( defined( 'DOING_CRON' ) && DOING_CRON ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_doing_cron() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $available_space = @disk_free_space( WP_CONTENT_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2017-05-06 14:24:37 UTC (rev 40574)
+++ trunk/src/wp-admin/includes/update.php 2017-05-06 14:29:01 UTC (rev 40575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => wp_doing_cron() ? 30 : 3,
</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"> $response = wp_remote_get( $url, $options );
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2017-05-06 14:24:37 UTC (rev 40574)
+++ trunk/src/wp-includes/load.php 2017-05-06 14:29:01 UTC (rev 40575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1060,6 +1060,24 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determines whether the current request is a WordPress cron request.
+ *
+ * @since 4.8.0
+ *
+ * @return bool True if it's a WordPress cron request, false otherwise.
+ */
+function wp_doing_cron() {
+ /**
+ * Filters whether the current request is a WordPress cron request.
+ *
+ * @since 4.8.0
+ *
+ * @param bool $wp_doing_cron Whether the current request is a WordPress cron request.
+ */
+ return apply_filters( 'wp_doing_cron', defined( 'DOING_CRON' ) && DOING_CRON );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Check whether variable is a WordPress Error.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns true if $thing is an object of the WP_Error class.
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2017-05-06 14:24:37 UTC (rev 40574)
+++ trunk/src/wp-includes/update.php 2017-05-06 14:29:01 UTC (rev 40575)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,8 +108,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doing_cron = wp_doing_cron();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $options = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => $doing_cron ? 30 : 3,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_install' => $wp_install,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +179,7 @@
</span><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"> // Trigger background updates if running non-interactively, and we weren't called from the update handler.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'DOING_CRON' ) && DOING_CRON && ! doing_action( 'wp_maybe_auto_update' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_maybe_auto_update' );
</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">@@ -217,6 +219,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_option = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_option->last_checked = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doing_cron = wp_doing_cron();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check for update on a different schedule, depending on the page.
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( current_filter() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrader_process_complete' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +234,7 @@
</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">- if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $doing_cron ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timeout = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $timeout = 12 * HOUR_IN_SECONDS;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locales = apply_filters( 'plugins_update_check_locales', $locales );
</span><span class="cx" style="display: block; padding: 0 10px"> $locales = array_unique( $locales );
</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 ( defined( 'DOING_CRON' ) && DOING_CRON ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $doing_cron ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timeout = 30;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Three seconds, plus one extra second for every 10 plugins
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,6 +404,8 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doing_cron = wp_doing_cron();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check for update on a different schedule, depending on the page.
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( current_filter() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrader_process_complete' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,11 +419,7 @@
</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">- if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
- $timeout = 0;
- } else {
- $timeout = 12 * HOUR_IN_SECONDS;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $timeout = $doing_cron ? 0 : 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">@@ -463,7 +465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locales = apply_filters( 'themes_update_check_locales', $locales );
</span><span class="cx" style="display: block; padding: 0 10px"> $locales = array_unique( $locales );
</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 ( defined( 'DOING_CRON' ) && DOING_CRON ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $doing_cron ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timeout = 30;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Three seconds, plus one extra second for every 10 themes
</span></span></pre>
</div>
</div>
</body>
</html>