<!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>[13235] trunk/wp-admin/plugins.php: Full Multisite support for dropins/
mu-plugins in admin area.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13235">13235</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-19 21:53:24 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Full Multisite support for dropins/mu-plugins in admin area. Ensure that network, drop-ins and mu-plugins are only shown and counted to super admins. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a>, <a href="http://trac.wordpress.org/ticket/11861">#11861</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (13234 => 13235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-02-19 21:19:54 UTC (rev 13234)
+++ trunk/wp-admin/plugins.php 2010-02-19 21:53:24 UTC (rev 13235)
</span><span class="lines">@@ -365,8 +365,8 @@
</span><span class="cx"> $recently_activated = get_option('recently_activated', array());
</span><span class="cx"> $upgrade_plugins = array();
</span><span class="cx"> $network_plugins = array();
</span><del>-$mustuse_plugins = get_mu_plugins();
-$dropins_plugins = get_dropins();
</del><ins>+$mustuse_plugins = ( is_multisite() && is_super_admin() ) || ! is_multisite() ? get_mu_plugins() : array();
+$dropins_plugins = ( is_multisite() && is_super_admin() ) || ! is_multisite() ? get_dropins() : array();
</ins><span class="cx">
</span><span class="cx"> set_transient( 'plugin_slugs', array_keys($all_plugins), 86400 );
</span><span class="cx">
</span><span class="lines">@@ -389,8 +389,9 @@
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $all_plugins as $plugin_file => $plugin_data) {
</span><span class="cx"> // Filter into individual sections
</span><del>- if ( is_plugin_active_for_network($plugin_file) && is_super_admin() ) {
- $network_plugins[ $plugin_file ] = $plugin_data;
</del><ins>+ if ( is_plugin_active_for_network($plugin_file) ) {
+ if ( is_super_admin() )
+ $network_plugins[ $plugin_file ] = $plugin_data;
</ins><span class="cx"> } elseif ( is_plugin_active($plugin_file) ) {
</span><span class="cx"> $active_plugins[ $plugin_file ] = $plugin_data;
</span><span class="cx"> } else {
</span><span class="lines">@@ -399,8 +400,8 @@
</span><span class="cx"> $inactive_plugins[ $plugin_file ] = $plugin_data;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset( $current->response[ $plugin_file ] ) )
- $upgrade_plugins[ $plugin_file ] = $plugin_data;
</del><ins>+ if ( isset( $current->response[ $plugin_file ] ) )
+ $upgrade_plugins[ $plugin_file ] = $plugin_data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('update_plugins') )
</span><span class="lines">@@ -538,24 +539,19 @@
</span><span class="cx"> $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
</del><ins>+ if ( is_multisite() && is_network_only_plugin( $plugin_file ) )
+ $actions[] = '<span title="' . __('This plugin can only be activated for all sites in a network') . '">' . __('Network Only') . '</span>';
+ else
+ $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
</ins><span class="cx"> if ( is_multisite() && is_super_admin() )
</span><span class="cx"> $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
</span><ins>+
+ if ( !is_multisite() && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
+ $actions[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
+
+ if ( ! $is_active && current_user_can('delete_plugins') )
+ $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
</ins><span class="cx"> }
</span><del>-
- if ( is_multisite() && is_network_only_plugin( $plugin_file ) )
- $actions[] = '<span title="' . __('This plugin can only be activated for all sites in a network') . '">' . __('Network Only') . '</span>';
- else
- $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
- if ( is_multisite() && is_super_admin() )
- $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
-
- if ( !is_multisite() && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
- $actions[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
-
- if ( ! $is_active && current_user_can('delete_plugins') )
- $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
</span></span></pre>
</div>
</div>
</body>
</html>