Changeset 13679

Timestamp:

03/11/2010 11:53:03 PM (15 years ago)

Author:

nacin

Message:

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

Location:

trunk/wp-admin

Files:

• menu.php (modified) (1 diff)
• network.php (modified) (2 diffs)

trunk/wp-admin/menu.php

@@ -183 +183 @@
     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');
 

trunk/wp-admin/network.php

@@ -16 +16 @@
 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.
@@ -287 +290 @@
 
 # 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 )