<!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>[49582] trunk/src: Administration: Make sure auto-update counts properly update when bulk deleting plugins or themes.</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/49582">49582</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/49582","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-11-12 20:40:13 +0000 (Thu, 12 Nov 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'>Administration: Make sure auto-update counts properly update when bulk deleting plugins or themes.
Props pbiron, noisysocks, desrosj, audrasjb, hellofromTonya.
Fixes <a href="https://core.trac.wordpress.org/ticket/50870">#50870</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswpupdatesjs">trunk/src/js/_enqueues/wp/updates.js</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueswpupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/updates.js 2020-11-12 20:19:46 UTC (rev 49581)
+++ trunk/src/js/_enqueues/wp/updates.js 2020-11-12 20:40:13 UTC (rev 49582)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,22 +8,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global pagenow */
</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">- * @param {jQuery} $ jQuery object.
- * @param {object} wp WP object.
- * @param {object} settings WP Updates settings.
- * @param {string} settings.ajax_nonce Ajax nonce.
- * @param {object=} settings.plugins Base names of plugins in their different states.
- * @param {Array} settings.plugins.all Base names of all plugins.
- * @param {Array} settings.plugins.active Base names of active plugins.
- * @param {Array} settings.plugins.inactive Base names of inactive plugins.
- * @param {Array} settings.plugins.upgrade Base names of plugins with updates available.
- * @param {Array} settings.plugins.recently_activated Base names of recently activated plugins.
- * @param {object=} settings.themes Plugin/theme status information or null.
- * @param {number} settings.themes.all Amount of all themes.
- * @param {number} settings.themes.upgrade Amount of themes with updates available.
- * @param {number} settings.themes.disabled Amount of disabled themes.
- * @param {object=} settings.totals Combined information for available update counts.
- * @param {number} settings.totals.count Holds the amount of available updates.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {jQuery} $ jQuery object.
+ * @param {object} wp WP object.
+ * @param {object} settings WP Updates settings.
+ * @param {string} settings.ajax_nonce Ajax nonce.
+ * @param {object=} settings.plugins Base names of plugins in their different states.
+ * @param {Array} settings.plugins.all Base names of all plugins.
+ * @param {Array} settings.plugins.active Base names of active plugins.
+ * @param {Array} settings.plugins.inactive Base names of inactive plugins.
+ * @param {Array} settings.plugins.upgrade Base names of plugins with updates available.
+ * @param {Array} settings.plugins.recently_activated Base names of recently activated plugins.
+ * @param {Array} settings.plugins['auto-update-enabled'] Base names of plugins set to auto-update.
+ * @param {Array} settings.plugins['auto-update-disabled'] Base names of plugins set to not auto-update.
+ * @param {object=} settings.themes Slugs of themes in their different states.
+ * @param {Array} settings.themes.all Slugs of all themes.
+ * @param {Array} settings.themes.upgrade Slugs of themes with updates available.
+ * @param {Arrat} settings.themes.disabled Slugs of disabled themes.
+ * @param {Array} settings.themes['auto-update-enabled'] Slugs of themes set to auto-update.
+ * @param {Array} settings.themes['auto-update-disabled'] Slugs of themes set to not auto-update.
+ * @param {object=} settings.totals Combined information for available update counts.
+ * @param {number} settings.totals.count Holds the amount of available updates.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> (function( $, wp, settings ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $document = $( document ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1007,6 +1011,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">+ if ( -1 !== _.indexOf( plugins['auto-update-enabled'], response.plugin ) ) {
+ plugins['auto-update-enabled'] = _.without( plugins['auto-update-enabled'], response.plugin );
+ if ( plugins['auto-update-enabled'].length ) {
+ $views.find( '.auto-update-enabled .count' ).text( '(' + plugins['auto-update-enabled'].length + ')' );
+ } else {
+ $views.find( '.auto-update-enabled' ).remove();
+ }
+ }
+
+ if ( -1 !== _.indexOf( plugins['auto-update-disabled'], response.plugin ) ) {
+ plugins['auto-update-disabled'] = _.without( plugins['auto-update-disabled'], response.plugin );
+ if ( plugins['auto-update-disabled'].length ) {
+ $views.find( '.auto-update-disabled .count' ).text( '(' + plugins['auto-update-disabled'].length + ')' );
+ } else {
+ $views.find( '.auto-update-disabled' ).remove();
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> plugins.all = _.without( plugins.all, response.plugin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( plugins.all.length ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1505,7 +1527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $themeRows.css( { backgroundColor: '#faafaa' } ).fadeOut( 350, function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var $views = $( '.subsubsub' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $themeRow = $( this ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- totals = settings.themes,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ themes = settings.themes,
</ins><span class="cx" style="display: block; padding: 0 10px"> deletedRow = wp.template( 'item-deleted-row' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $themeRow.hasClass( 'plugin-update-tr' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1521,23 +1543,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $themeRow.remove();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove theme from update count.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $themeRow.hasClass( 'update' ) ) {
- totals.upgrade--;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 !== _.indexOf( themes.upgrade, response.slug ) ) {
+ themes.upgrade = _.without( themes.upgrade, response.slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.updates.decrementCount( 'theme' );
</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"> // Remove from views.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $themeRow.hasClass( 'inactive' ) ) {
- totals.disabled--;
- if ( totals.disabled ) {
- $views.find( '.disabled .count' ).text( '(' + totals.disabled + ')' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 !== _.indexOf( themes.disabled, response.slug ) ) {
+ themes.disabled = _.without( themes.disabled, response.slug );
+ if ( themes.disabled.length ) {
+ $views.find( '.disabled .count' ).text( '(' + themes.disabled.length + ')' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $views.find( '.disabled' ).remove();
</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">+ if ( -1 !== _.indexOf( themes['auto-update-enabled'], response.slug ) ) {
+ themes['auto-update-enabled'] = _.without( themes['auto-update-enabled'], response.slug );
+ if ( themes['auto-update-enabled'].length ) {
+ $views.find( '.auto-update-enabled .count' ).text( '(' + themes['auto-update-enabled'].length + ')' );
+ } else {
+ $views.find( '.auto-update-enabled' ).remove();
+ }
+ }
+
+ if ( -1 !== _.indexOf( themes['auto-update-disabled'], response.slug ) ) {
+ themes['auto-update-disabled'] = _.without( themes['auto-update-disabled'], response.slug );
+ if ( themes['auto-update-disabled'].length ) {
+ $views.find( '.auto-update-disabled .count' ).text( '(' + themes['auto-update-disabled'].length + ')' );
+ } else {
+ $views.find( '.auto-update-disabled' ).remove();
+ }
+ }
+
+ themes.all = _.without( themes.all, response.slug );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // There is always at least one theme available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $views.find( '.all .count' ).text( '(' + --totals.all + ')' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $views.find( '.all .count' ).text( '(' + themes.all.length + ')' );
</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">
</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-11-12 20:19:46 UTC (rev 49581)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-11-12 20:40:13 UTC (rev 49582)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,9 +206,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
</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">- $totals = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $totals = array();
+ $js_themes = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $type => $list ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $totals[ $type ] = count( $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $totals[ $type ] = count( $list );
+ $js_themes[ $type ] = array_keys( $list );
</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"> if ( empty( $themes[ $status ] ) && ! in_array( $status, array( 'all', 'search' ), true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'updates',
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpUpdatesItemCounts',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'themes' => $totals,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'themes' => $js_themes,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'totals' => wp_get_update_data(),
</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="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-11-12 20:19:46 UTC (rev 49581)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-11-12 20:40:13 UTC (rev 49582)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $js_plugins = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $plugins as $key => $list ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $js_plugins[ $key ] = array_keys( (array) $list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $js_plugins[ $key ] = array_keys( $list );
</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_localize_script(
</span></span></pre>
</div>
</div>
</body>
</html>