From 4fbfbf5f61f793c05d0e9f82d349d5d0fa4e6f7f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 16 Apr 2020 17:02:08 +0000 Subject: [PATCH] Plugins: Add HTML ID attributes to plugin action links for easier targeting in browser-based testing. Props roytanck, shooper. Fixes #49916. Built from https://develop.svn.wordpress.org/trunk@47588 git-svn-id: http://core.svn.wordpress.org/trunk@47363 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-plugins-list-table.php | 32 +++++++++++++------ wp-includes/version.php | 2 +- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php index ba8584ecc6..9334f86347 100644 --- a/wp-admin/includes/class-wp-plugins-list-table.php +++ b/wp-admin/includes/class-wp-plugins-list-table.php @@ -529,6 +529,7 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( current_user_can( 'update_plugins' ) ) { $actions['update-selected'] = __( 'Update' ); } + if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) { $actions['delete-selected'] = __( 'Delete' ); } @@ -620,8 +621,11 @@ class WP_Plugins_List_Table extends WP_List_Table { global $status, $page, $s, $totals; list( $plugin_file, $plugin_data ) = $item; - $context = $status; - $screen = $this->screen; + + $plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_data['Name'] ); + + $context = $status; + $screen = $this->screen; // Pre-order. $actions = array( @@ -675,8 +679,9 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( $is_active ) { if ( current_user_can( 'manage_network_plugins' ) ) { $actions['deactivate'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=deactivate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Network Deactivate' ) @@ -685,17 +690,20 @@ class WP_Plugins_List_Table extends WP_List_Table { } else { if ( current_user_can( 'manage_network_plugins' ) ) { $actions['activate'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Network Activate' ) ); } + if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) { $actions['delete'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=delete-selected&checked[]=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins' ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Delete' ) @@ -714,17 +722,20 @@ class WP_Plugins_List_Table extends WP_List_Table { } elseif ( $is_active ) { if ( current_user_can( 'deactivate_plugin', $plugin_file ) ) { $actions['deactivate'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=deactivate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Deactivate' ) ); } + if ( current_user_can( 'resume_plugin', $plugin_file ) && is_plugin_paused( $plugin_file ) ) { $actions['resume'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=resume&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'resume-plugin_' . $plugin_file ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Resume %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Resume' ) @@ -733,8 +744,9 @@ class WP_Plugins_List_Table extends WP_List_Table { } else { if ( current_user_can( 'activate_plugin', $plugin_file ) ) { $actions['activate'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Activate' ) @@ -743,8 +755,9 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) { $actions['delete'] = sprintf( - '%s', + '%s', wp_nonce_url( 'plugins.php?action=delete-selected&checked[]=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins' ), + esc_attr( $plugin_slug ), /* translators: %s: Plugin name. */ esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ), __( 'Delete' ) @@ -860,7 +873,6 @@ class WP_Plugins_List_Table extends WP_List_Table { $class .= ' paused'; } - $plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name ); printf( '', esc_attr( $class ), diff --git a/wp-includes/version.php b/wp-includes/version.php index ab995df6b9..2693034d81 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47587'; +$wp_version = '5.5-alpha-47588'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.