Changeset 48704

Timestamp:

07/31/2020 05:22:06 PM (5 years ago)

Author:

whyisjake

Message:

Upgrade/Install: Ensure the proper count of plugins that have auto-update enabled.

As certain plugins may not support updates, this count needs to accurately reflect that in the navbar.

This brings the changes from [48703] to the WordPress 5.5 branch.

Fixes 50808.
Props knutsp, audrasjb, pbiron, dd32, apedog, afragen, chriscct7, garyc40, whyisjake, SergeyBiryukov.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)

branches/5.5/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -280 +280 @@
 
             if ( $this->show_autoupdates ) {
-                if ( in_array( $plugin_file, $auto_updates, true ) ) {
-                    $plugins['auto-update-enabled'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+                $enabled = in_array( $plugin_file, $auto_updates, true ) && $plugin_data['update-supported'];
+                if ( isset( $plugin_data['auto-update-forced'] ) ) {
+                    $enabled = (bool) $plugin_data['auto-update-forced'];
+                }
+
+                if ( $enabled ) {
+                    $plugins['auto-update-enabled'][ $plugin_file ] = $plugin_data;
                 } else {
-                    $plugins['auto-update-disabled'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+                    $plugins['auto-update-disabled'][ $plugin_file ] = $plugin_data;
                 }
             }