<!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>[48669] trunk/src/wp-admin: Upgrade/Install: Enhance auto-updates to be disabled for plugins that don't suport updates.</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/48669">48669</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/48669","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-28 16:30:48 +0000 (Tue, 28 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: Enhance auto-updates to be disabled for plugins that don't suport updates.
This removes the toggle UI when updates aren't available. When plugins use the filter, the UI is updated to show that they are being controlled via code. And then removed entirely when not available.
See <a href="https://core.trac.wordpress.org/ticket/50798">#50798</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/50280">#50280</a>.
Props elrae, pbiron, SergeyBiryukov, audrasjb, azaozz, StephenCronin, whyisjake, dd32, TimothyBlynJacobs, desrosj.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></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-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-07-28 16:17:13 UTC (rev 48668)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-07-28 16:30:48 UTC (rev 48669)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,21 +203,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
- $plugins['all'][ $plugin_file ] = $plugin_data;
- // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade.
- if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
- $plugins['upgrade'][ $plugin_file ] = $plugin_data;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], array( 'auto-update-supported' => true ), $plugin_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
- $plugins['all'][ $plugin_file ] = $plugin_data;
- // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade.
- if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
- $plugins['upgrade'][ $plugin_file ] = $plugin_data;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], array( 'auto-update-supported' => true ), $plugin_data );
+ } elseif ( empty( $plugin_data['auto-update-supported'] ) ) {
+ $plugin_data['auto-update-supported'] = false;
</ins><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">+ /*
+ * Create the payload that's used for the auto_update_plugin filter.
+ * This is the same data contained within $plugin_info->(response|no_update) however
+ * not all plugins will be contained in those keys, this avoids unexpected warnings.
+ */
+ $filter_payload = array(
+ 'id' => $plugin_file,
+ 'slug' => '',
+ 'plugin' => $plugin_file,
+ 'new_version' => '',
+ 'url' => '',
+ 'package' => '',
+ 'icons' => array(),
+ 'banners' => array(),
+ 'banners_rtl' => array(),
+ 'tested' => '',
+ 'requires_php' => '',
+ 'compatibility' => new stdClass(),
+ );
+ $filter_payload = (object) array_merge( $filter_payload, array_intersect_key( $plugin_data, $filter_payload ) );
+
+ /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ $auto_update_forced = apply_filters( 'auto_update_plugin', null, $filter_payload );
+ if ( ! is_null( $auto_update_forced ) ) {
+ $plugin_data['auto-update-forced'] = $auto_update_forced;
+ }
+
+ $plugins['all'][ $plugin_file ] = $plugin_data;
+ // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade.
+ if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
+ $plugins['upgrade'][ $plugin_file ] = $plugin_data;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Filter into individual sections.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $show_network_active ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1060,7 +1085,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = array();
</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 ( in_array( $plugin_file, $auto_updates, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $plugin_data['auto-update-forced'] ) ) {
+ if ( $plugin_data['auto-update-forced'] ) {
+ // Forced on
+ $text = __( 'Auto-updates enabled' );
+ } else {
+ $text = __( 'Auto-updates disabled' );
+ }
+ $action = 'unavailable';
+ $time_class = ' hidden';
+ } elseif ( ! $plugin_data['auto-update-supported'] ) {
+ $text = '';
+ $action = 'unavailable';
+ $time_class = ' hidden';
+ } elseif ( in_array( $plugin_file, $auto_updates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = __( 'Disable auto-updates' );
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'disable';
</span><span class="cx" style="display: block; padding: 0 10px"> $time_class = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,19 +1117,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( $query_args, 'plugins.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html[] = sprintf(
- '<a href="%s" class="toggle-auto-update aria-button-if-js" data-wp-action="%s">',
- wp_nonce_url( $url, 'updates' ),
- $action
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'unavailable' == $action ) {
+ $html[] = '<span class="label">' . $text . '</span>';
+ } else {
+ $html[] = sprintf(
+ '<a href="%s" class="toggle-auto-update aria-button-if-js" data-wp-action="%s">',
+ wp_nonce_url( $url, 'updates' ),
+ $action
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html[] = '<span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span>';
- $html[] = '<span class="label">' . $text . '</span>';
- $html[] = '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html[] = '<span class="dashicons dashicons-update spin hidden" aria-hidden="true"></span>';
+ $html[] = '<span class="label">' . $text . '</span>';
+ $html[] = '</a>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $available_updates = get_site_transient( 'update_plugins' );
-
- if ( isset( $available_updates->response[ $plugin_file ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $plugin_data['update'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="auto-update-time%s">%s</div>',
</span><span class="cx" style="display: block; padding: 0 10px"> $time_class,
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2020-07-28 16:17:13 UTC (rev 48668)
+++ trunk/src/wp-admin/plugins.php 2020-07-28 16:30:48 UTC (rev 48669)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,6 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Auto-updates' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Auto-updates can be enabled or disabled for each individual plugin. Plugins with auto-updates enabled will display the estimated date of the next auto-update. Auto-updates depends on the WP-Cron task scheduling system.' ) . '</p>' .
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'Auto-updates are only available for plugins recognized by WordPress.org, or that include a compatible update system.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Please note: Third-party themes and plugins, or custom code, may override WordPress scheduling.' ) . '</p>',
</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>