<!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>[49241] trunk/src/wp-admin/includes: Upgrade/Install: Introduce a wrapper for the `auto_update_{$type}` filter checks.</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/49241">49241</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/49241","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-20 17:37:16 +0000 (Tue, 20 Oct 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: Introduce a wrapper for the `auto_update_{$type}` filter checks.
This allows for cleaner checks whether auto-updates are forced for a plugin or theme.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/48750">[48750]</a>.
Props rebasaurus, garrett-eclipse, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/50875">#50875</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.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-10-20 17:33:46 UTC (rev 49240)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2020-10-20 17:37:16 UTC (rev 49241)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -977,9 +977,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item = array_merge( $item, array_intersect_key( $plugin, $item ) );
</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">- $type = 'plugin';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, (object) $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'plugin', null, (object) $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $auto_update_forced ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled = $auto_update_forced;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1121,9 +1119,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'theme';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, (object) $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, (object) $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $auto_update_forced ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled = $auto_update_forced;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1209,9 +1205,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'theme';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, (object) $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, (object) $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $auto_update_forced ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled = $auto_update_forced;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1299,9 +1293,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'theme';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, (object) $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, (object) $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $auto_update_forced ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled = $auto_update_forced;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1327,7 +1319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $auto_updates_string = apply_filters( 'theme_auto_update_debug_string', $auto_updates_string, $theme, $enabled );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_version_string .= ' | ' . $auto_updates_string;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme_version_string_debug .= ',' . $auto_updates_string;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_version_string_debug .= ', ' . $auto_updates_string;
</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"> $info['wp-themes-inactive']['fields'][ sanitize_text_field( $theme->name ) ] = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></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-ms-themes-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-ms-themes-list-table.php 2020-10-20 17:33:46 UTC (rev 49240)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-10-20 17:37:16 UTC (rev 49241)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,9 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filter_payload = array_merge( $filter_payload, array_intersect_key( $theme_data, $filter_payload ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'theme';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, (object) $filter_payload );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, $filter_payload );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $auto_update_forced ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->auto_update_forced = $auto_update_forced;
</span></span></pre></div>
<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-10-20 17:33:46 UTC (rev 49240)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-10-20 17:37:16 UTC (rev 49241)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,11 +229,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'requires_php' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'compatibility' => new stdClass(),
</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"> $filter_payload = (object) array_merge( $filter_payload, array_intersect_key( $plugin_data, $filter_payload ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'plugin';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, $filter_payload );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'plugin', null, $filter_payload );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $auto_update_forced ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['auto-update-forced'] = $auto_update_forced;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></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-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2020-10-20 17:33:46 UTC (rev 49240)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2020-10-20 17:37:16 UTC (rev 49241)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2398,14 +2398,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'requires_php' => '5.6.20',
</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">- $type = 'plugin';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $test_plugins_enabled = apply_filters( "auto_update_{$type}", true, $mock_plugin );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test_plugins_enabled = wp_is_auto_update_forced_for_item( 'plugin', true, $mock_plugin );
+ $test_themes_enabled = wp_is_auto_update_forced_for_item( 'theme', true, $mock_theme );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'theme';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $test_themes_enabled = apply_filters( "auto_update_{$type}", true, $mock_theme );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $ui_enabled_for_plugins = wp_is_auto_update_enabled_for_type( 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ui_enabled_for_themes = wp_is_auto_update_enabled_for_type( 'theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_filter_present = has_filter( 'auto_update_plugin' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2020-10-20 17:33:46 UTC (rev 49240)
+++ trunk/src/wp-admin/includes/theme.php 2020-10-20 17:37:16 UTC (rev 49241)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,9 +716,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'theme';
- /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
- $auto_update_forced = apply_filters( "auto_update_{$type}", null, $auto_update_filter_payload );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $auto_update_forced = wp_is_auto_update_forced_for_item( 'theme', null, $auto_update_filter_payload );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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></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 2020-10-20 17:33:46 UTC (rev 49240)
+++ trunk/src/wp-admin/includes/update.php 2020-10-20 17:37:16 UTC (rev 49241)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,6 +1046,22 @@
</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">+ * Checks whether auto-updates are forced for an item.
+ *
+ * @since 5.6.0
+ *
+ * @param string $type The type of update being checked: 'theme' or 'plugin'.
+ * @param bool|null $update Whether to update. The value of null is internally used
+ * to detect whether nothing has hooked into this filter.
+ * @param object $item The update offer.
+ * @return bool True if auto-updates are forced for `$item`, false otherwise.
+ */
+function wp_is_auto_update_forced_for_item( $type, $update, $item ) {
+ /** This filter is documented in wp-admin/includes/class-wp-automatic-updater.php */
+ return apply_filters( "auto_update_{$type}", $update, $item );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Determines the appropriate auto-update message to be displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span></span></pre>
</div>
</div>
</body>
</html>