<!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>[16011] trunk/wp-admin/includes/plugin.php: Pass $network_wide flag to de/
activation hooks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16011">16011</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-27 13:20:53 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass $network_wide flag to de/activation hooks. See <a href="http://trac.wordpress.org/ticket/14170">#14170</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.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 (16010 => 16011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-10-27 11:57:55 UTC (rev 16010)
+++ trunk/wp-admin/includes/plugin.php 2010-10-27 13:20:53 UTC (rev 16011)
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> * @return WP_Error|null WP_Error on invalid file or null on success.
</span><span class="cx"> */
</span><span class="cx"> function activate_plugin( $plugin, $redirect = '', $network_wide = false) {
</span><del>- $plugin = plugin_basename( trim( $plugin ) );
</del><ins>+ $plugin = plugin_basename( trim( $plugin ) );
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
</span><span class="cx"> $network_wide = true;
</span><span class="lines">@@ -482,8 +482,8 @@
</span><span class="cx"> wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
</span><span class="cx"> ob_start();
</span><span class="cx"> include(WP_PLUGIN_DIR . '/' . $plugin);
</span><del>- do_action( 'activate_plugin', trim( $plugin) );
- do_action( 'activate_' . trim( $plugin ) );
</del><ins>+ do_action( 'activate_plugin', $plugin, $network_wide );
+ do_action( 'activate_' . $plugin, $network_wide );
</ins><span class="cx"> if ( $network_wide ) {
</span><span class="cx"> $current[$plugin] = time();
</span><span class="cx"> update_site_option( 'active_sitewide_plugins', $current );
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> sort($current);
</span><span class="cx"> update_option('active_plugins', $current);
</span><span class="cx"> }
</span><del>- do_action( 'activated_plugin', trim( $plugin) );
</del><ins>+ do_action( 'activated_plugin', $plugin, $network_wide );
</ins><span class="cx"> if ( ob_get_length() > 0 ) {
</span><span class="cx"> $output = ob_get_clean();
</span><span class="cx"> return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
</span><span class="lines">@@ -521,29 +521,29 @@
</span><span class="cx"> $do_blog = $do_network = false;
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $plugins as $plugin ) {
</span><del>- $plugin = plugin_basename($plugin);
</del><ins>+ $plugin = plugin_basename( trim( $plugin ) );
</ins><span class="cx"> if ( ! is_plugin_active($plugin) )
</span><span class="cx"> continue;
</span><ins>+
+ $network_wide = is_plugin_active_for_network( $plugin );
+
</ins><span class="cx"> if ( ! $silent )
</span><del>- do_action( 'deactivate_plugin', trim( $plugin ) );
</del><ins>+ do_action( 'deactivate_plugin', $plugin, $network_wide );
</ins><span class="cx">
</span><del>- if ( is_plugin_active_for_network($plugin) ) {
- // Deactivate network wide
</del><ins>+ if ( $network_wide ) {
</ins><span class="cx"> $do_network = true;
</span><span class="cx"> unset( $network_current[ $plugin ] );
</span><span class="cx"> } else {
</span><del>- // Deactivate for this blog only
- $key = array_search( $plugin, (array) $current );
</del><ins>+ $key = array_search( $plugin, $current );
</ins><span class="cx"> if ( false !== $key ) {
</span><span class="cx"> $do_blog = true;
</span><span class="cx"> array_splice( $current, $key, 1 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
</del><span class="cx"> if ( ! $silent ) {
</span><del>- do_action( 'deactivate_' . trim( $plugin ) );
- do_action( 'deactivated_plugin', trim( $plugin ) );
</del><ins>+ do_action( 'deactivate_' . $plugin, $network_wide );
+ do_action( 'deactivated_plugin', $plugin, $network_wide );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>