<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16089] trunk/wp-admin: Fix bulk actions for Network Admin -> plugins.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16089">16089</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-29 19:09:04 +0000 (Fri, 29 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bulk actions for Network Admin -> plugins. See <a href="http://trac.wordpress.org/ticket/14435">#14435</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludeslisttablepluginsphp">trunk/wp-admin/includes/list-table-plugins.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludeslisttablepluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-plugins.php (16088 => 16089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-plugins.php 2010-10-29 19:00:15 UTC (rev 16088)
+++ trunk/wp-admin/includes/list-table-plugins.php 2010-10-29 19:09:04 UTC (rev 16089)
</span><span class="lines">@@ -253,21 +253,20 @@
</span><span class="cx"> global $status;
</span><span class="cx">
</span><span class="cx"> $actions = array();
</span><del>- if ( 'active' != $status )
- $actions['activate-selected'] = __( 'Activate' );
- if ( is_multisite() && 'network' != $status )
- $actions['network-activate-selected'] = __( 'Network Activate' );
</del><ins>+
+ if ( 'active' != $status ) {
+ $action = is_network_admin() ? 'network-activate-selected' : 'activate-selected';
+ $actions[ $action ] = __( 'Activate' );
+ }
+
</ins><span class="cx"> if ( 'inactive' != $status && 'recent' != $status )
</span><span class="cx"> $actions['deactivate-selected'] = __( 'Deactivate' );
</span><del>- 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'] );
</del><ins>+
+ 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' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $actions;
</span><span class="lines">@@ -424,4 +423,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (16088 => 16089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-10-29 19:00:15 UTC (rev 16088)
+++ trunk/wp-admin/plugins.php 2010-10-29 19:09:04 UTC (rev 16089)
</span><span class="lines">@@ -63,7 +63,13 @@
</span><span class="cx"> check_admin_referer('bulk-plugins');
</span><span class="cx">
</span><span class="cx"> $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><del>- $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
</del><ins>+
+ // 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 ] );
+
</ins><span class="cx"> if ( empty($plugins) ) {
</span><span class="cx"> wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
</span><span class="cx"> exit;
</span></span></pre>
</div>
</div>
</body>
</html>