Changeset 28772

Timestamp:

06/18/2014 02:22:45 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Revert [28766].

see #28555.

File:

• trunk/src/wp-admin/includes/class-wp-list-table.php (modified) (2 diffs)

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

@@ -372 +372 @@
         echo "</select>\n";
 
-        submit_button( __( 'Apply' ), 'action', 'bulk_action', false, array( 'id' => "doaction$two" ) );
+        submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) );
         echo "\n";
     }
@@ -385 +385 @@
      */
     public function current_action() {
-        if ( ! empty( $_REQUEST['bulk_action'] ) ) {
-
-            // Bulk Actions drop-down above the list table.
-            if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
-                return $_REQUEST['action'];
-            }
-
-            // Bulk Actions drop-down below the list table.
-            if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
-                return $_REQUEST['action2'];
-            }
-        }
+        if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
+            return $_REQUEST['action'];
+
+        if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
+            return $_REQUEST['action2'];
 
         return false;