<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11966] trunk: Active plugin filter, plugin deactivation array_splice()
protection.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11966">11966</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2009-09-24 04:15:37 +0000 (Thu, 24 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Active plugin filter, plugin deactivation array_splice() protection. props apeatling. fixes <a href="http://trac.wordpress.org/ticket/10839">#10839</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.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 (11965 => 11966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2009-09-24 01:54:07 UTC (rev 11965)
+++ trunk/wp-admin/includes/plugin.php 2009-09-24 04:15:37 UTC (rev 11966)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> * @return bool True, if in the active plugins list. False, not in the list.
</span><span class="cx"> */
</span><span class="cx"> function is_plugin_active($plugin) {
</span><del>- return in_array($plugin, get_option('active_plugins'));
</del><ins>+ return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -347,7 +347,12 @@
</span><span class="cx"> continue;
</span><span class="cx"> if ( ! $silent )
</span><span class="cx"> do_action( 'deactivate_plugin', trim( $plugin ) );
</span><del>- array_splice($current, array_search( $plugin, $current), 1 ); // Fixed Array-fu!
</del><ins>+
+ $key = array_search( $plugin, (array) $current );
+
+ if ( false !== $key )
+ array_splice( $current, $key, 1 );
+
</ins><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="cx"> if ( ! $silent ) {
</span><span class="cx"> do_action( 'deactivate_' . trim( $plugin ) );
</span><span class="lines">@@ -484,7 +489,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function validate_active_plugins() {
</span><del>- $check_plugins = get_option('active_plugins');
</del><ins>+ $check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
</ins><span class="cx">
</span><span class="cx"> // Sanity check. If the active plugin list is not an array, make it an
</span><span class="cx"> // empty array.
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (11965 => 11966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2009-09-24 01:54:07 UTC (rev 11965)
+++ trunk/wp-settings.php 2009-09-24 04:15:37 UTC (rev 11966)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> require(ABSPATH . 'my-hacks.php');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$current_plugins = get_option('active_plugins');
</del><ins>+$current_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
</ins><span class="cx"> if ( is_array($current_plugins) && !defined('WP_INSTALLING') ) {
</span><span class="cx"> foreach ( $current_plugins as $plugin ) {
</span><span class="cx"> // check the $plugin filename
</span></span></pre>
</div>
</div>
</body>
</html>