Fix bulk actions for Network Admin -> plugins. See #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@16089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
4a4408117c
commit
b0641c55c9
|
@ -253,21 +253,20 @@ class WP_Plugins_Table extends WP_List_Table {
|
||||||
global $status;
|
global $status;
|
||||||
|
|
||||||
$actions = array();
|
$actions = array();
|
||||||
if ( 'active' != $status )
|
|
||||||
$actions['activate-selected'] = __( 'Activate' );
|
if ( 'active' != $status ) {
|
||||||
if ( is_multisite() && 'network' != $status )
|
$action = is_network_admin() ? 'network-activate-selected' : 'activate-selected';
|
||||||
$actions['network-activate-selected'] = __( 'Network Activate' );
|
$actions[ $action ] = __( 'Activate' );
|
||||||
|
}
|
||||||
|
|
||||||
if ( 'inactive' != $status && 'recent' != $status )
|
if ( 'inactive' != $status && 'recent' != $status )
|
||||||
$actions['deactivate-selected'] = __( 'Deactivate' );
|
$actions['deactivate-selected'] = __( 'Deactivate' );
|
||||||
if ( current_user_can( 'update_plugins' ) )
|
|
||||||
$actions['update-selected'] = __( 'Update' );
|
|
||||||
if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
|
|
||||||
$actions['delete-selected'] = __( 'Delete' );
|
|
||||||
|
|
||||||
if ( is_multisite() && !is_network_admin() ) {
|
if ( !is_multisite() || is_network_admin() ) {
|
||||||
unset( $actions['network-activate-selected'] );
|
if ( current_user_can( 'update_plugins' ) )
|
||||||
unset( $actions['update-selected'] );
|
$actions['update-selected'] = __( 'Update' );
|
||||||
unset( $actions['delete-selected'] );
|
if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
|
||||||
|
$actions['delete-selected'] = __( 'Delete' );
|
||||||
}
|
}
|
||||||
|
|
||||||
return $actions;
|
return $actions;
|
||||||
|
|
|
@ -63,7 +63,13 @@ if ( $action ) {
|
||||||
check_admin_referer('bulk-plugins');
|
check_admin_referer('bulk-plugins');
|
||||||
|
|
||||||
$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
|
$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
|
||||||
$plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
|
|
||||||
|
// Only activate plugins which are not already active.
|
||||||
|
$check = $network_wide ? 'is_plugin_active_for_network' : 'is_plugin_active';
|
||||||
|
foreach ( $plugins as $i => $plugin )
|
||||||
|
if ( $check( $plugin ) )
|
||||||
|
unset( $plugins[ $i ] );
|
||||||
|
|
||||||
if ( empty($plugins) ) {
|
if ( empty($plugins) ) {
|
||||||
wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
|
wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
|
||||||
exit;
|
exit;
|
||||||
|
|
Loading…
Reference in New Issue