From 1cb0f9042b8922b4257adf18c876c2702c96880a Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 11 Mar 2010 23:53:03 +0000
Subject: [PATCH] Don't allow access to network.php if running an MU network.
 It is only for networks created in 3.0. see #11816. Also, fix MS htaccess
 logic, see #12136

git-svn-id: http://svn.automattic.com/wordpress/trunk@13679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php    | 2 +-
 wp-admin/network.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 6a08b2c40..269db8d70 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -182,7 +182,7 @@ $menu[75] = array( __('Tools'), 'read', 'tools.php', '', 'menu-top menu-icon-too
 	$submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
 	if ( is_multisite() && !is_main_site() )
 		$submenu['tools.php'][25] = array( __('Delete Site'), 'manage_options', 'ms-delete-site.php' );
-	if ( is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
+	if ( ( ! is_multisite() || defined( 'MULTISITE' ) ) && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE && is_super_admin() )
 		$submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div' );
diff --git a/wp-admin/network.php b/wp-admin/network.php
index 78ed836e7..8fe9058f9 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -16,6 +16,9 @@ require_once( './admin.php' );
 if ( ! is_super_admin() )
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
 
+if ( is_multisite() && ! defined( 'MULTISITE' ) )
+	wp_die( __('The Network creation panel is not for WordPress MU networks.') );
+
 // We need to create references to ms global tables to enable Network.
 foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
 	$wpdb->$table = $prefixed_table;
@@ -286,7 +289,7 @@ RewriteBase ' . $base . '
 RewriteRule ^index\.php$ - [L]
 
 # uploaded files
-RewriteRule ^' . ( $vhost ? '([_0-9a-zA-Z-]+/)?' : '' ) . 'files/(.+) wp-includes/ms-files.php?file=$2 [L]' . "\n";
+RewriteRule ^' . ( $vhost ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $vhost ? 1 : 2 ) . ' [L]' . "\n";
 
 if ( ! $vhost )
 	$htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n";