mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-25 17:13:30 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Revert [28766].

Browse Source 
see #28555.

git-svn-id: https://develop.svn.wordpress.org/trunk@28772 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2014-06-18 02:22:45 +00:00
parent 9561db4dee
commit 6719d08d2d
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wp-admin/includes/class-wp-list-table.php
View File

@ -371,7 +371,7 @@ class WP_List_Table {
echo "</select>\n"; 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"; echo "\n";
} }
@ -384,18 +384,11 @@ class WP_List_Table {
* @return string|bool The action name or False if no action was selected * @return string|bool The action name or False if no action was selected
*/ */
public function current_action() { public function current_action() {
if ( ! empty( $_REQUEST['bulk_action'] ) ) { if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
return $_REQUEST['action'];
// Bulk Actions drop-down above the list table. if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) { return $_REQUEST['action2'];
return $_REQUEST['action'];
}
// Bulk Actions drop-down below the list table.
if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
return $_REQUEST['action2'];
}
}
return false; return false;
} }