<!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>[48698] branches/5.5/src: Upgrade/Install: Only show auto-update for themes that support the feature.</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 { white-space: pre-line; 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/48698">48698</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/48698","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-30 22:02:54 +0000 (Thu, 30 Jul 2020)</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'>Upgrade/Install: Only show auto-update for themes that support the feature.
Similar to the changes for plugins in <a href="https://core.trac.wordpress.org/changeset/48669">[48669]</a>, let's only show the UI for themes when updates are supported for that theme.
This brings the changes from <a href="https://core.trac.wordpress.org/changeset/48688">[48688]</a> to the 5.5 branch.
See <a href="https://core.trac.wordpress.org/ticket/50280">#50280</a>.
Props dd32.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches55srcjs_enqueueswpthemejs">branches/5.5/src/js/_enqueues/wp/theme.js</a></li>
<li><a href="#branches55srcwpadminincludesthemephp">branches/5.5/src/wp-admin/includes/theme.php</a></li>
<li><a href="#branches55srcwpadminthemesphp">branches/5.5/src/wp-admin/themes.php</a></li>
<li><a href="#branches55srcwpincludesupdatephp">branches/5.5/src/wp-includes/update.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches55">branches/5.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.5
</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/5.5 2020-07-30 21:50:39 UTC (rev 48697)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.5 2020-07-30 22:02:54 UTC (rev 48698)
</ins><a id="branches55"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.5</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/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:48685-48686,48689,48696
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:48685-48686,48688-48689,48696
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches55srcjs_enqueueswpthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/src/js/_enqueues/wp/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/src/js/_enqueues/wp/theme.js 2020-07-30 21:50:39 UTC (rev 48697)
+++ branches/5.5/src/js/_enqueues/wp/theme.js 2020-07-30 22:02:54 UTC (rev 48698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,8 +802,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Support concurrent clicks in different Theme Details overlays.
</span><span class="cx" style="display: block; padding: 0 10px"> callback = function( event, data ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var autoupdate;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( _this.model.get( 'id' ) === data.asset ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _this.model.set( { autoupdate: 'enable' === data.state } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ autoupdate = _this.model.get( 'autoupdate' );
+ autoupdate.enabled = 'enable' === data.state;
+ _this.model.set( { autoupdate: autoupdate } );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( document ).off( 'wp-auto-update-setting-changed', callback );
</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="branches55srcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/src/wp-admin/includes/theme.php 2020-07-30 21:50:39 UTC (rev 48697)
+++ branches/5.5/src/wp-admin/includes/theme.php 2020-07-30 22:02:54 UTC (rev 48698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,12 +647,16 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $updates = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $updates = array();
+ $no_updates = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $updates_transient = get_site_transient( 'update_themes' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $updates_transient->response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = $updates_transient->response;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $updates_transient->no_update ) ) {
+ $no_updates = $updates_transient->no_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"> WP_Theme::sort_by_name( $themes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,6 +694,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $auto_update = in_array( $slug, $auto_updates, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $auto_update_action = $auto_update ? 'disable-auto-update' : 'enable-auto-update';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $updates[ $slug ] ) ) {
+ $auto_update_supported = true;
+ $auto_update_filter_payload = (object) $updates[ $slug ];
+ } elseif ( isset( $no_updates[ $slug ] ) ) {
+ $auto_update_supported = true;
+ $auto_update_filter_payload = (object) $no_updates[ $slug ];
+ } else {
+ $auto_update_supported = false;
+ /*
+ * Create the expected payload for the auto_update_theme filter, this is the same data
+ * as contained within $updates or $no_updates but used when the Theme is not known.
+ */
+ $auto_update_filter_payload = (object) array(
+ 'theme' => $slug,
+ 'new_version' => $theme->get( 'Version' ),
+ 'url' => '',
+ 'package' => '',
+ 'requires' => $theme->get( 'RequiresWP' ),
+ 'requires_php' => $theme->get( 'RequiresPHP' ),
+ );
+ }
+
+ /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ $auto_update_forced = apply_filters( 'auto_update_theme', null, $auto_update_filter_payload );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $prepared_themes[ $slug ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $theme->display( 'Name' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +739,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'hasUpdate' => isset( $updates[ $slug ] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hasPackage' => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ]['package'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => get_theme_update_available( $theme ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'autoupdate' => $auto_update,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'autoupdate' => array(
+ 'enabled' => $auto_update || $auto_update_forced,
+ 'supported' => $auto_update_supported,
+ 'forced' => $auto_update_forced,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'actions' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize' => $customize_action,
</span></span></pre></div>
<a id="branches55srcwpadminthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/src/wp-admin/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/src/wp-admin/themes.php 2020-07-30 21:50:39 UTC (rev 48697)
+++ branches/5.5/src/wp-admin/themes.php 2020-07-30 22:02:54 UTC (rev 48698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,17 +675,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_theme_auto_update_setting_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> $template = '
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-autoupdate">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( data.autoupdate ) { #>
- <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="disable">
- <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Disable auto-updates' ) . '</span>
- </button>
- <# } else { #>
- <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="enable">
- <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Enable auto-updates' ) . '</span>
- </button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.autoupdate.supported ) { #>
+ <# if ( data.autoupdate.forced === false ) { #>
+ ' . __( 'Auto-updates disabled' ) . '
+ <# } else if ( data.autoupdate.forced ) { #>
+ ' . __( 'Auto-updates enabled' ) . '
+ <# } else if ( data.autoupdate.enabled ) { #>
+ <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="disable">
+ <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Disable auto-updates' ) . '</span>
+ </button>
+ <# } else { #>
+ <button type="button" class="toggle-auto-update button-link" data-slug="{{ data.id }}" data-wp-action="enable">
+ <span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span><span class="label">' . __( 'Enable auto-updates' ) . '</span>
+ </button>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.hasUpdate ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# if ( data.autoupdate ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.autoupdate.supported && data.autoupdate.enabled ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="auto-update-time">
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="auto-update-time hidden">
</span></span></pre></div>
<a id="branches55srcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/src/wp-includes/update.php 2020-07-30 21:50:39 UTC (rev 48697)
+++ branches/5.5/src/wp-includes/update.php 2020-07-30 22:02:54 UTC (rev 48698)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,6 +621,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_update->response = $response['themes'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_update->no_update = $response['no_update'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_update->translations = $response['translations'];
</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>