WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [28766]. 

see #28555.
Built from https://develop.svn.wordpress.org/trunk@28772


git-svn-id: http://core.svn.wordpress.org/trunk@28585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-06-18 02:23:13 +00:00
parent d2a43e7cb2
commit 5bd180bcbd
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,7 @@ class WP_List_Table {
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";
}
@ -384,18 +384,11 @@ class WP_List_Table {
* @return string|bool The action name or False if no action was selected
*/
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['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['action2'] ) && -1 != $_REQUEST['action2'] )
return $_REQUEST['action2'];
return false;
}