sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bulk actions for Network Admin -> plugins. See #14435 

git-svn-id: https://develop.svn.wordpress.org/trunk@16089 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
scribu 2010-10-29 19:09:04 +00:00
parent f05e4fcd2b
commit e76a5fe8b3
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-admin/includes/list-table-plugins.php
View File

@ -253,21 +253,20 @@ class WP_Plugins_Table extends WP_List_Table {
global $status;
$actions = array();
if ( 'active' != $status )
$actions['activate-selected'] = __( 'Activate' );
if ( is_multisite() && 'network' != $status )
$actions['network-activate-selected'] = __( 'Network Activate' );
if ( 'active' != $status ) {
$action = is_network_admin() ? 'network-activate-selected' : 'activate-selected';
$actions[ $action ] = __( 'Activate' );
}
if ( 'inactive' != $status && 'recent' != $status )
$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() ) {
unset( $actions['network-activate-selected'] );
unset( $actions['update-selected'] );
unset( $actions['delete-selected'] );
if ( !is_multisite() || is_network_admin() ) {
if ( current_user_can( 'update_plugins' ) )
$actions['update-selected'] = __( 'Update' );
if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
$actions['delete-selected'] = __( 'Delete' );
}
return $actions;
@ -424,4 +423,4 @@ class WP_Plugins_Table extends WP_List_Table {
}
}
?>
?>

8
wp-admin/plugins.php
View File

@ -63,7 +63,13 @@ if ( $action ) {
check_admin_referer('bulk-plugins');
$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) ) {
wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;