<!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>[12974] trunk/wp-admin: Network plugin activation cleanup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12974">12974</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-05 18:10:30 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network plugin activation cleanup. Props nacin. see <a href="http://trac.wordpress.org/ticket/12139">#12139</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (12973 => 12974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-02-05 17:59:24 UTC (rev 12973)
+++ trunk/wp-admin/includes/plugin.php 2010-02-05 18:10:30 UTC (rev 12974)
</span><span class="lines">@@ -395,14 +395,14 @@
</span><span class="cx"> if ( is_plugin_active_for_network($plugin) ) {
</span><span class="cx"> // Deactivate network wide
</span><span class="cx"> $do_network = true;
</span><del>- unset($network_current[$plugin]);
</del><ins>+ unset( $network_current[ $plugin ] );
</ins><span class="cx"> } else {
</span><span class="cx"> // Deactivate for this blog only
</span><del>- $do_blog = true;
</del><span class="cx"> $key = array_search( $plugin, (array) $current );
</span><del>-
- if ( false !== $key )
</del><ins>+ if ( false !== $key ) {
+ $do_blog = true;
</ins><span class="cx"> array_splice( $current, $key, 1 );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() && is_super_admin() ) {
</span><span class="cx"> $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
</span><del>- $plugins = array_merge( $plugins, $network_plugins );
</del><ins>+ $plugins = array_merge( $plugins, array_keys( $network_plugins ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $plugins ) )
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (12973 => 12974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-02-05 17:59:24 UTC (rev 12973)
+++ trunk/wp-admin/plugins.php 2010-02-05 18:10:30 UTC (rev 12974)
</span><span class="lines">@@ -477,8 +477,8 @@
</span><span class="cx"> }
</span><span class="cx"> foreach ( (array)$plugins as $plugin_file => $plugin_data) {
</span><span class="cx"> $actions = array();
</span><del>- $is_active = is_plugin_active($plugin_file);
</del><span class="cx"> $is_active_for_network = is_plugin_active_for_network($plugin_file);
</span><ins>+ $is_active = $is_active_for_network || is_plugin_active( $plugin_file );
</ins><span class="cx">
</span><span class="cx"> if ( $is_active_for_network && !is_super_admin() )
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>