WordPress.org

Make WordPress Core

Changeset 13634


Ignore:
Timestamp:
03/09/2010 07:10:07 PM (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/menu.php

    r13607 r13634  
    182182    if ( is_multisite() && ($current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path) )
    183183        $submenu['tools.php'][25] = array( __('Delete Blog'), 'manage_options', 'ms-delete-site.php' );
    184     if ( !is_multisite() && is_super_admin() && defined('WP_ENABLE_MULTISITE') )
     184    if ( !is_multisite() && is_super_admin() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
    185185        $submenu['tools.php'][50] = array(__('Network'), 'manage_options', 'network.php');
    186186
  • trunk/wp-admin/network.php

    r13633 r13634  
    2525foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
    2626    $wpdb->$table = $prefixed_table;
     27
     28if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
     29    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.' ) );
    2730
    2831$title = __( 'Create a Network of WordPress Sites' );
Note: See TracChangeset for help on using the changeset viewer.