<!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>[13679] trunk/wp-admin: Don't allow access to network.
php if running an MU network.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13679">13679</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-11 23:53:03 +0000 (Thu, 11 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't allow access to network.php if running an MU network. It is only for networks created in 3.0. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a>. Also, fix MS htaccess logic, see <a href="http://trac.wordpress.org/ticket/12136">#12136</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13678 => 13679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-03-11 23:33:01 UTC (rev 13678)
+++ trunk/wp-admin/menu.php 2010-03-11 23:53:03 UTC (rev 13679)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
</span><span class="cx"> if ( is_multisite() && !is_main_site() )
</span><span class="cx"> $submenu['tools.php'][25] = array( __('Delete Site'), 'manage_options', 'ms-delete-site.php' );
</span><del>- if ( is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
</del><ins>+ if ( ( ! is_multisite() || defined( 'MULTISITE' ) ) && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE && is_super_admin() )
</ins><span class="cx"> $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
</span><span class="cx">
</span><span class="cx"> $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div' );
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13678 => 13679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-11 23:33:01 UTC (rev 13678)
+++ trunk/wp-admin/network.php 2010-03-11 23:53:03 UTC (rev 13679)
</span><span class="lines">@@ -16,6 +16,9 @@
</span><span class="cx"> if ( ! is_super_admin() )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
</span><span class="cx">
</span><ins>+if ( is_multisite() && ! defined( 'MULTISITE' ) )
+ wp_die( __('The Network creation panel is not for WordPress MU networks.') );
+
</ins><span class="cx"> // We need to create references to ms global tables to enable Network.
</span><span class="cx"> foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
</span><span class="cx"> $wpdb->$table = $prefixed_table;
</span><span class="lines">@@ -286,7 +289,7 @@
</span><span class="cx"> RewriteRule ^index\.php$ - [L]
</span><span class="cx">
</span><span class="cx"> # uploaded files
</span><del>-RewriteRule ^' . ( $vhost ? '([_0-9a-zA-Z-]+/)?' : '' ) . 'files/(.+) wp-includes/ms-files.php?file=$2 [L]' . "\n";
</del><ins>+RewriteRule ^' . ( $vhost ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $vhost ? 1 : 2 ) . ' [L]' . "\n";
</ins><span class="cx">
</span><span class="cx"> if ( ! $vhost )
</span><span class="cx"> $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n";
</span></span></pre>
</div>
</div>
</body>
</html>