Ticket #39186: 39186.3.patch

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

@@ -470 +470 @@
 
                 echo "</select>\n";
 
-                submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two" ) );
+                submit_button( __( 'Apply' ), 'action', '', false, array( 'id' => "doaction$two", 'name' => "doaction$two" ) );
                 echo "\n";
         }
 
@@ -486 +486 @@
                 if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
                         return false;
 
-                if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
+                if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] && isset($_REQUEST['doaction']) )
                         return $_REQUEST['action'];
 
-                if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
+                if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] && isset($_REQUEST['doaction2']) )
                         return $_REQUEST['action2'];
 
                 return false;

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

@@ -601 +601 @@
                                 if ( $is_active ) {
                                         if ( current_user_can( 'manage_network_plugins' ) ) {
                                                 /* translators: %s: plugin name */
-                                                $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+                                                $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;doaction&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
                                                 }
                                 } else {
                                         if ( current_user_can( 'manage_network_plugins' ) ) {
                                                 /* translators: %s: plugin name */
-                                                $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $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>';
+                                                $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;doaction&amp;plugin=' . $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 ) ) {
                                                 /* translators: %s: plugin name */
@@ -624 +624 @@
                                         );
                                 } elseif ( $is_active ) {
                                         /* translators: %s: plugin name */
-                                        $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+                                        $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;doaction&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
                                 } else {
                                         /* translators: %s: plugin name */
-                                        $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $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>';
+                                        $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;doaction&amp;plugin=' . $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' ) ) {
                                                 /* translators: %s: plugin name */

wp-admin/includes/class-wp-terms-list-table.php

@@ -164 +164 @@
          * @return string
          */
         public function current_action() {
-                if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
+                if ( isset( $_REQUEST['delete_tags'] ) && (
+                                ( isset( $_REQUEST['doaction'] ) && 'delete' == $_REQUEST['action'] ) ||
+                                ( isset( $_REQUEST['doaction2'] ) && 'delete' == $_REQUEST['action2'] )
+                        ) ) {
                         return 'bulk-delete';
+                }
 
                 return parent::current_action();
         }

wp-admin/includes/class-wp-users-list-table.php

@@ -267 +267 @@
                         <?php wp_dropdown_roles(); ?>
                 </select>
         <?php
-                        submit_button( __( 'Change' ), '', 'changeit', false );
+                        $submit_name = 'bottom' === $which ? 'changeit2' : 'changeit';
+                        submit_button( __( 'Change' ), '', $submit_name, false );
                 endif;
 
                 /**
@@ -295 +296 @@
          * @return string The bulk action required.
          */
         public function current_action() {
-                if ( isset( $_REQUEST['changeit'] ) &&
-                        ( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
+                if ( ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) || ( isset( $_REQUEST['changeit2'] ) && ! empty( $_REQUEST['new_role2'] ) ) ) {
                         return 'promote';
                 }
 

wp-admin/users.php

@@ -103 +103 @@
 
         $editable_roles = get_editable_roles();
         $role = false;
-        if ( ! empty( $_REQUEST['new_role2'] ) ) {
+        if ( isset( $_REQUEST['changeit2'] ) && ! empty( $_REQUEST['new_role2'] ) ) {
                 $role = $_REQUEST['new_role2'];
-        } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
+        } elseif ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
                 $role = $_REQUEST['new_role'];
         }