From 116d5d03c3b66e52698b2793db6b024b3274c867 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Sat, 10 Jun 2023 05:30:22 +0000 Subject: [PATCH] Plugins: Display Auto-updates filters when the current view is "Must Use" or "Drop-in". This changeset fixes a bug where the "Auto-updates Enabled/Disabled" filters were not showing when the current view is "Must Use" or "Drop-in". Props NekoJonez, pbiron, costdev, audrasjb. Fixes #54309. Built from https://develop.svn.wordpress.org/trunk@55903 git-svn-id: http://core.svn.wordpress.org/trunk@55415 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-plugins-list-table.php | 7 +++---- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index 28107f3b3f..2dcb495e40 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -61,8 +61,7 @@ class WP_Plugins_List_Table extends WP_List_Table { $this->show_autoupdates = wp_is_auto_update_enabled_for_type( 'plugin' ) && current_user_can( 'update_plugins' ) - && ( ! is_multisite() || $this->screen->in_admin( 'network' ) ) - && ! in_array( $status, array( 'mustuse', 'dropins' ), true ); + && ( ! is_multisite() || $this->screen->in_admin( 'network' ) ); } /** @@ -463,7 +462,7 @@ class WP_Plugins_List_Table extends WP_List_Table { 'description' => __( 'Description' ), ); - if ( $this->show_autoupdates ) { + if ( $this->show_autoupdates && ! in_array( $status, array( 'mustuse', 'dropins' ), true ) ) { $columns['auto-updates'] = __( 'Automatic Updates' ); } @@ -1154,7 +1153,7 @@ class WP_Plugins_List_Table extends WP_List_Table { echo ''; break; case 'auto-updates': - if ( ! $this->show_autoupdates ) { + if ( ! $this->show_autoupdates || in_array( $status, array( 'mustuse', 'dropins' ), true ) ) { break; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 606e9413ee..f071346287 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55902'; +$wp_version = '6.3-alpha-55903'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.