<!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" />
<title>[21741] branches/3.4/wp-admin: Only allow operations on network plugins through the network admin.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21741">21741</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-04 20:53:05 +0000 (Tue, 04 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only allow operations on network plugins through the network admin. fixes <a href="http://core.trac.wordpress.org/ticket/21187">#21187</a>. merges <a href="http://core.trac.wordpress.org/changeset/21700">[21700]</a> and <a href="http://core.trac.wordpress.org/changeset/21740">[21740]</a> to the 3.4 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches34wpadminincludesclasswppluginslisttablephp">branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#branches34wpadminpluginsphp">branches/3.4/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches34wpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php (21740 => 21741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php 2012-09-04 20:51:33 UTC (rev 21740)
+++ branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php 2012-09-04 20:53:05 UTC (rev 21741)
</span><span class="lines">@@ -90,8 +90,10 @@
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
</span><span class="cx"> // Filter into individual sections
</span><del>- if ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
</del><ins>+ if ( is_multisite() && ! $screen->is_network && is_network_only_plugin( $plugin_file ) ) {
</ins><span class="cx"> unset( $plugins['all'][ $plugin_file ] );
</span><ins>+ } elseif ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
+ unset( $plugins['all'][ $plugin_file ] );
</ins><span class="cx"> } elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )
</span><span class="cx"> || ( $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
</span><span class="cx"> $plugins['active'][ $plugin_file ] = $plugin_data;
</span></span></pre></div>
<a id="branches34wpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/plugins.php (21740 => 21741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/plugins.php 2012-09-04 20:51:33 UTC (rev 21740)
+++ branches/3.4/wp-admin/plugins.php 2012-09-04 20:53:05 UTC (rev 21741)
</span><span class="lines">@@ -51,6 +51,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! is_network_admin() ) {
</span><ins>+ if ( is_network_only_plugin( $plugin ) ) {
+ wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+ exit;
+ }
+
</ins><span class="cx"> $recent = (array) get_option( 'recently_activated' );
</span><span class="cx"> unset( $recent[ $plugin ] );
</span><span class="cx"> update_option( 'recently_activated', $recent );
</span><span class="lines">@@ -72,10 +77,17 @@
</span><span class="cx"> $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><span class="cx">
</span><span class="cx"> // Only activate plugins which are not already active.
</span><del>- $check = is_network_admin() ? 'is_plugin_active_for_network' : 'is_plugin_active';
- foreach ( $plugins as $i => $plugin )
- if ( $check( $plugin ) )
- unset( $plugins[ $i ] );
</del><ins>+ if ( is_network_admin() ) {
+ foreach ( $plugins as $i => $plugin ) {
+ if ( is_plugin_active_for_network( $plugin ) )
+ unset( $plugins[ $i ] );
+ }
+ } else {
+ foreach ( $plugins as $i => $plugin ) {
+ if ( is_plugin_active( $plugin ) || is_network_only_plugin( $plugin ) )
+ unset( $plugins[ $i ] );
+ }
+ }
</ins><span class="cx">
</span><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></pre>
</div>
</div>
</body>
</html>