Ticket #42404: 42404.patch

src/wp-admin/includes/ajax-actions.php

@@ -4210 +4210 @@
                 'slug'   => sanitize_key( wp_unslash( $_POST['slug'] ) ),
         );
 
-        if ( ! current_user_can( 'delete_plugins' ) || 0 !== validate_file( $plugin ) ) {
-                $status['errorMessage'] = __( 'Sorry, you are not allowed to delete plugins for this site.' );
+        if ( ! current_user_can( 'delete_plugin', $plugin ) || 0 !== validate_file( $plugin ) ) {
+                $status['errorMessage'] = __( 'Sorry, you are not allowed to delete this plugin.' );
                 wp_send_json_error( $status );
         }
 

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

@@ -628 +628 @@
                                                 /* translators: %s: plugin name */
                                                 $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
                                         }
-                                        if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+                                        if ( current_user_can( 'delete_plugin', $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
                                                 /* translators: %s: plugin name */
                                                 $actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
                                         }
@@ -653 +653 @@
                                                 $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
                                         }
 
-                                        if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+                                        if ( ! is_multisite() && current_user_can( 'delete_plugin', $plugin_file ) ) {
                                                 /* translators: %s: plugin name */
                                                 $actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
                                         }

src/wp-admin/plugins.php

@@ -248 +248 @@
                         exit;
 
                 case 'delete-selected':
-                        if ( ! current_user_can( 'delete_plugins' ) ) {
-                                wp_die( __( 'Sorry, you are not allowed to delete plugins for this site.' ) );
+                        if ( ! current_user_can( 'delete_plugin', $plugin ) ) {
+                                wp_die( __( 'Sorry, you are not allowed to delete this plugin.' ) );
                         }
 
                         check_admin_referer( 'bulk-plugins' );

src/wp-includes/capabilities.php

@@ -416 +416 @@
                         break;
                 case 'update_plugins':
                 case 'delete_plugins':
+                case 'delete_plugin':
                 case 'install_plugins':
                 case 'upload_plugins':
                 case 'update_themes':