Ticket #46872: 46872.4.diff

src/js/_enqueues/admin/common.js

@@ -1220 +1220 @@
         });
 
         /**
+         * Marries a secondary control to its primary control.
+         *
+         * @param {jQuery} topSelector    The top selector element.
+         * @param {jQuery} topSubmit      The top submit element.
+         * @param {jQuery} bottomSelector The bottom selector element.
+         * @param {jQuery} bottomSubmit   The bottom submit element.
+         * @return {void}
+         */
+        function marryControls( topSelector, topSubmit, bottomSelector, bottomSubmit ) {
+                /**
+                 * Updates the primary selector when the secondary selector is changed.
+                 *
+                 * @since 5.7.0
+                 *
+                 * @return {void}
+                 */
+                function updateTopSelector() {
+                        topSelector.val($(this).val());
+                }
+                bottomSelector.on('change', updateTopSelector);
+
+                /**
+                 * Updates the secondary selector when the primary selector is changed.
+                 *
+                 * @since 5.7.0
+                 *
+                 * @return {void}
+                 */
+                function updateBottomSelector() {
+                        bottomSelector.val($(this).val());
+                }
+                topSelector.on('change', updateBottomSelector);
+
+                /**
+                 * Triggers the primary submit when then secondary submit is clicked.
+                 *
+                 * @since 5.7.0
+                 *
+                 * @return {void}
+                 */
+                function triggerSubmitClick(e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+
+                        topSubmit.trigger('click');
+                }
+                bottomSubmit.on('click', triggerSubmitClick);
+        }
+
+        // Marry the secondary "Bulk actions" controls to the primary controls:
+        marryControls( $('#bulk-action-selector-top'), $('#doaction'), $('#bulk-action-selector-bottom'), $('#doaction2') );
+
+        // Marry the secondary "Change role to" controls to the primary controls:
+        marryControls( $('#new_role'), $('#changeit'), $('#new_role2'), $('#changeit2') );
+
+        /**
          * Shows row actions on focus of its parent container element or any other elements contained within.
          *
          * @return {void}
@@ -1321 +1377 @@
                 pageInput.closest('form').submit( function() {
                         /*
                          * action = bulk action dropdown at the top of the table
-                         * action2 = bulk action dropdow at the bottom of the table
                          */
-                        if ( $('select[name="action"]').val() == -1 && $('select[name="action2"]').val() == -1 && pageInput.val() == currentPage )
+                        if ( $('select[name="action"]').val() == -1 && pageInput.val() == currentPage )
                                 pageInput.val('1');
                 });
         }

src/js/_enqueues/admin/edit-comments.js

@@ -808 +808 @@
                         commentReply.toggle($(this).parent());
                 });
 
-                $('#doaction, #doaction2, #post-query-submit').click(function(){
+                $('#doaction, #post-query-submit').click(function(){
                         if ( $('#the-comment-list #replyrow').length > 0 )
                                 commentReply.close();
                 });

src/js/_enqueues/admin/inline-edit-post.js

@@ -139 +139 @@
                 /**
                  * Adds onclick events to the apply buttons.
                  */
-                $('#doaction, #doaction2').click(function(e){
+                $('#doaction').click(function(e){
                         var n;
 
                         t.whichBulkButtonId = $( this ).attr( 'id' );

src/js/_enqueues/admin/media.js

@@ -178 +178 @@
                 $( '#find-posts-close' ).click( findPosts.close );
 
                 // Binds the bulk action events to the submit buttons.
-                $( '#doaction, #doaction2' ).click( function( event ) {
+                $( '#doaction' ).click( function( event ) {
 
                         /*
-                         * Retrieves all select elements for bulk actions that have a name starting with `action`
-                         * and handle its action based on its value.
+                         * Handle the bulk action based on its value.
                          */
-                        $( 'select[name^="action"]' ).each( function() {
+                        $( 'select[name="action"]' ).each( function() {
                                 var optionValue = $( this ).val();
 
                                 if ( 'attach' === optionValue ) {

src/wp-admin/css/forms.css

@@ -492 +492 @@
         margin: 0 8px 0 0;
 }
 
+/* @since 5.7.0 secondary bulk action controls require JS. */
+.no-js label[for="bulk-action-selector-bottom"],
+.no-js select#bulk-action-selector-bottom,
+.no-js input#doaction2,
+.no-js label[for="new_role2"],
+.no-js select#new_role2,
+.no-js input#changeit2 {
+        display: none;
+}
+
 .tablenav .actions select {
         float: left;
         margin-right: 6px;

src/wp-admin/edit-comments.php

@@ -31 +31 @@
                 $doaction       = 'delete';
         } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
                 $comment_ids = $_REQUEST['delete_comments'];
-                $doaction    = ( '-1' !== $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+                $doaction    = $_REQUEST['action'];
         } elseif ( isset( $_REQUEST['ids'] ) ) {
                 $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
         } elseif ( wp_get_referer() ) {

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

@@ -526 +526 @@
                         return $_REQUEST['action'];
                 }
 
-                if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
-                        return $_REQUEST['action2'];
-                }
-
                 return false;
         }
 

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

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

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

@@ -335 +335 @@
          * @return string The bulk action required.
          */
         public function current_action() {
-                if ( ( isset( $_REQUEST['changeit'] ) || isset( $_REQUEST['changeit2'] ) ) &&
-                        ( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
+                if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
                         return 'promote';
                 }
 

src/wp-admin/network/site-users.php

@@ -140 +140 @@
                 case 'promote':
                         check_admin_referer( 'bulk-users' );
                         $editable_roles = get_editable_roles();
-                        $role           = false;
-                        if ( ! empty( $_REQUEST['new_role2'] ) ) {
-                                $role = $_REQUEST['new_role2'];
-                        } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
-                                $role = $_REQUEST['new_role'];
-                        }
+                        $role           = $_REQUEST['new_role'];
 
                         if ( empty( $editable_roles[ $role ] ) ) {
                                 wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );

src/wp-admin/network/sites.php

@@ -177 +177 @@
                         break;
 
                 case 'allblogs':
-                        if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
-                                $doaction = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
+                        if ( isset( $_POST['action'] ) && isset( $_POST['allblogs'] ) ) {
+                                $doaction = $_POST['action'];
 
                                 foreach ( (array) $_POST['allblogs'] as $key => $val ) {
                                         if ( '0' != $val && get_network()->site_id != $val ) {

src/wp-admin/network/users.php

@@ -46 +46 @@
                                 wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
                         }
 
-                        if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
+                        if ( isset( $_POST['action'] ) && isset( $_POST['allusers'] ) ) {
                                 check_admin_referer( 'bulk-users-network' );
 
-                                $doaction     = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
+                                $doaction     = $_POST['action'];
                                 $userfunction = '';
 
                                 foreach ( (array) $_POST['allusers'] as $user_id ) {

src/wp-admin/users.php

@@ -112 +112 @@
                 }
 
                 $editable_roles = get_editable_roles();
-                $role           = false;
-                if ( ! empty( $_REQUEST['new_role2'] ) ) {
-                        $role = $_REQUEST['new_role2'];
-                } elseif ( ! empty( $_REQUEST['new_role'] ) ) {
-                        $role = $_REQUEST['new_role'];
-                }
+                $role           = $_REQUEST['new_role'];
 
                 if ( ! $role || empty( $editable_roles[ $role ] ) ) {
                         wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );