From 63596d6868b0792900e33b4f0927f2c9e6ec6058 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 17 Jun 2014 22:16:11 +0000
Subject: [PATCH] Prevent bulk actions from being performed when Filter button
 is clicked.

props layotte.
fixes #28555.

git-svn-id: https://develop.svn.wordpress.org/trunk@28766 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-list-table.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
index 76f25e0931..18f87fc0c1 100644
--- a/src/wp-admin/includes/class-wp-list-table.php
+++ b/src/wp-admin/includes/class-wp-list-table.php
@@ -371,7 +371,7 @@ class WP_List_Table {
 
 		echo "</select>\n";
 
-		submit_button( __( 'Apply' ), 'action', false, false, array( 'id' => "doaction$two" ) );
+		submit_button( __( 'Apply' ), 'action', 'bulk_action', false, array( 'id' => "doaction$two" ) );
 		echo "\n";
 	}
 
@@ -384,11 +384,18 @@ class WP_List_Table {
 	 * @return string|bool The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
-			return $_REQUEST['action'];
+		if ( ! empty( $_REQUEST['bulk_action'] ) ) {
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
-			return $_REQUEST['action2'];
+			// 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'];
+			}
+		}
 
 		return false;
 	}