Changeset 13634

Timestamp:

03/09/2010 07:10:07 PM (15 years ago)

Author:

nacin

Message:

Rename WP_ENABLE_MULTISITE to WP_ALLOW_MULTISITE to minimize confusion. Prevent direct access to network.php without the constant unless the install process was already started. see #11816 for network.php. see #11644

Location:

trunk/wp-admin

Files:

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

trunk/wp-admin/menu.php

@@ -182 +182 @@
     if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
         $submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
-    if ( !is_multisite() && is_super_admin() && defined('WP_ENABLE_MULTISITE') )
+    if ( !is_multisite() && is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
         $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
 

trunk/wp-admin/network.php

@@ -25 +25 @@
 foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
     $wpdb->$table = $prefixed_table;
+
+if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
+    wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
 
 $title = __( 'Create a Network of WordPress Sites' );