<!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>[48731] trunk/src/wp-admin/includes/class-wp-debug-data.php: Site Health: Display auto-update properly for plugins that don't support auto-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/48731">48731</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/48731","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-08-04 17:35:09 +0000 (Tue, 04 Aug 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'>Site Health: Display auto-update properly for plugins that don't support auto-updates.
Properly filter `auto_update_plugin` when displaying the table.
Fixes <a href="https://core.trac.wordpress.org/ticket/50822">#50822</a>.
Props Gwendydd, pbiron, audrasjb, SergeyBiryukov, whyisjake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpdebugdataphp"></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-debug-data.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php 2020-08-04 17:33:38 UTC (rev 48730)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2020-08-04 17:35:09 UTC (rev 48731)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,8 +905,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // List all available plugins.
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = get_plugins();
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_updates = get_plugin_updates();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $auto_updates = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $transient = get_site_transient( 'update_plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_updates = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $auto_updates_enabled = wp_is_auto_update_enabled_for_type( 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $auto_updates_enabled ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,29 +949,55 @@
</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"> if ( $auto_updates_enabled ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $plugin_path, $auto_updates, true ) ) {
- $auto_updates_string = __( 'Auto-updates enabled' );
- $enabled = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $transient->response[ $plugin_path ] ) ) {
+ $item = $transient->response[ $plugin_path ];
+ } elseif ( isset( $transient->no_update[ $plugin_path ] ) ) {
+ $item = $transient->no_update[ $plugin_path ];
+ } else {
+ $item = array(
+ 'id' => $plugin_path,
+ 'slug' => '',
+ 'plugin' => $plugin_path,
+ 'new_version' => '',
+ 'url' => '',
+ 'package' => '',
+ 'icons' => array(),
+ 'banners' => array(),
+ 'banners_rtl' => array(),
+ 'tested' => '',
+ 'requires_php' => '',
+ 'compatibility' => new stdClass(),
+ );
+ $item = (object) array_merge( $item, array_intersect_key( $plugin, $item ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the text string of the auto-updates setting for each plugin in the Site Health debug data.
- *
- * @since 5.5.0
- *
- * @param string $auto_updates_string The string output for the auto-updates column.
- * @param string $plugin_path The path to the plugin file.
- * @param array $plugin An array of plugin data.
- * @param bool $enabled Whether auto-updates are enabled for this item.
- */
- $auto_updates_string = apply_filters( 'plugin_auto_update_debug_string', $auto_updates_string, $plugin_path, $plugin, $enabled );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ $auto_update_forced = apply_filters( 'auto_update_plugin', null, $item );
+
+ if ( ! is_null( $auto_update_forced ) ) {
+ $enabled = $auto_update_forced;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $enabled = in_array( $plugin_path, $auto_updates, true );
+ }
+
+ if ( $enabled ) {
+ $auto_updates_string = __( 'Auto-updates enabled' );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $auto_updates_string = __( 'Auto-updates disabled' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $enabled = false;
-
- /** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
- $auto_updates_string = apply_filters( 'plugin_auto_update_debug_string', $auto_updates_string, $plugin_path, $plugin, $enabled );
</del><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">+ /**
+ * Filters the text string of the auto-updates setting for each plugin in the Site Health debug data.
+ *
+ * @since 5.5.0
+ *
+ * @param string $auto_updates_string The string output for the auto-updates column.
+ * @param string $plugin_path The path to the plugin file.
+ * @param array $plugin An array of plugin data.
+ * @param bool $enabled Whether auto-updates are enabled for this item.
+ */
+ $auto_updates_string = apply_filters( 'plugin_auto_update_debug_string', $auto_updates_string, $plugin_path, $plugin, $enabled );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_version_string .= ' | ' . $auto_updates_string;
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_version_string_debug .= ', ' . $auto_updates_string;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,6 +1021,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $active_theme = wp_get_theme();
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_updates = get_theme_updates();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $transient = get_site_transient( 'update_themes' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $active_theme_version = $active_theme->version;
</span><span class="cx" style="display: block; padding: 0 10px"> $active_theme_version_debug = $active_theme_version;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,28 +1099,39 @@
</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"> if ( $auto_updates_enabled ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $active_theme->stylesheet, $auto_updates, true ) ) {
- $auto_updates_string = __( 'Enabled' );
- $enabled = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $transient->response[ $active_theme->stylesheet ] ) ) {
+ $item = $transient->response[ $active_theme->stylesheet ];
+ } elseif ( isset( $transient->no_update[ $active_theme->stylesheet ] ) ) {
+ $item = $transient->no_update[ $active_theme->stylesheet ];
+ } else {
+ $item = (object) array(
+ 'theme' => $active_theme->stylesheet,
+ 'new_version' => $active_theme->version,
+ 'url' => '',
+ 'package' => '',
+ 'requires' => '',
+ 'requires_php' => '',
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the text string of the auto-updates setting for each theme in the Site Health debug data.
- *
- * @since 5.5.0
- *
- * @param string $auto_updates_string The string output for the auto-updates column.
- * @param WP_Theme $theme An object of theme data.
- * @param bool $enabled Whether auto-updates are enabled for this item.
- */
- $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $active_theme, $enabled );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ $auto_update_forced = apply_filters( 'auto_update_theme', null, $item );
+
+ if ( ! is_null( $auto_update_forced ) ) {
+ $enabled = $auto_update_forced;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $enabled = in_array( $active_theme->stylesheet, $auto_updates, true );
+ }
+
+ if ( $enabled ) {
+ $auto_updates_string = __( 'Enabled' );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $auto_updates_string = __( 'Disabled' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $enabled = false;
-
- /** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
- $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $active_theme, $enabled );
</del><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">+ /** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
+ $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $active_theme, $enabled );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $info['wp-active-theme']['fields']['auto_update'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Auto-updates' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $auto_updates_string,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1144,13 +1184,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => get_template_directory(),
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $auto_updates_enabled ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $parent_theme->stylesheet, $auto_updates, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $transient->response[ $parent_theme->stylesheet ] ) ) {
+ $item = $transient->response[ $parent_theme->stylesheet ];
+ } elseif ( isset( $transient->no_update[ $parent_theme->stylesheet ] ) ) {
+ $item = $transient->no_update[ $parent_theme->stylesheet ];
+ } else {
+ $item = (object) array(
+ 'theme' => $parent_theme->stylesheet,
+ 'new_version' => $parent_theme->version,
+ 'url' => '',
+ 'package' => '',
+ 'requires' => '',
+ 'requires_php' => '',
+ );
+ }
+
+ /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ $auto_update_forced = apply_filters( 'auto_update_theme', null, $item );
+
+ if ( ! is_null( $auto_update_forced ) ) {
+ $enabled = $auto_update_forced;
+ } else {
+ $enabled = in_array( $parent_theme->stylesheet, $auto_updates, true );
+ }
+
+ if ( $enabled ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_theme_auto_update_string = __( 'Enabled' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_theme_auto_update_string = __( 'Disabled' );
</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">+ /** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
+ $parent_theme_auto_update_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $parent_theme, $enabled );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $info['wp-parent-theme']['fields']['auto_update'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Auto-update' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $parent_theme_auto_update_string,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,20 +1275,47 @@
</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"> if ( $auto_updates_enabled ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $theme_slug, $auto_updates, true ) ) {
- $auto_updates_string = __( 'Auto-updates enabled' );
- $enabled = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $transient->response[ $theme_slug ] ) ) {
+ $item = $transient->response[ $theme_slug ];
+ } elseif ( isset( $transient->no_update[ $theme_slug ] ) ) {
+ $item = $transient->no_update[ $theme_slug ];
+ } else {
+ $item = (object) array(
+ 'theme' => $theme_slug,
+ 'new_version' => $theme->version,
+ 'url' => '',
+ 'package' => '',
+ 'requires' => '',
+ 'requires_php' => '',
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
- $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $theme, $enabled );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This action is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ $auto_update_forced = apply_filters( 'auto_update_theme', null, $item );
+
+ if ( ! is_null( $auto_update_forced ) ) {
+ $enabled = $auto_update_forced;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $enabled = in_array( $theme_slug, $auto_updates, true );
+ }
+
+ if ( $enabled ) {
+ $auto_updates_string = __( 'Auto-updates enabled' );
+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $auto_updates_string = __( 'Auto-updates disabled' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $enabled = false;
-
- /** This filter is documented in wp-admin/includes/class-wp-debug-data.php */
- $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $theme, $enabled );
</del><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">+ /**
+ * Filters the text string of the auto-updates setting for each theme in the Site Health debug data.
+ *
+ * @since 5.5.0
+ *
+ * @param string $auto_updates_string The string output for the auto-updates column.
+ * @param WP_Theme $theme An object of theme data.
+ * @param bool $enabled Whether auto-updates are enabled for this item.
+ */
+ $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $theme, $enabled );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_version_string .= ' | ' . $auto_updates_string;
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_version_string_debug .= ',' . $auto_updates_string;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>