Changeset 13638

Timestamp:

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

Author:

nacin

Message:

Expose a read-only network.php once multisite is enabled, to ensure access to original configuration such as rewrite rules. see #11816

Location:

trunk/wp-admin

Files:

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

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_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
+    if ( 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

@@ -16 +16 @@
 if ( ! is_super_admin() )
     wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
-
-if ( is_multisite() )
-    wp_die( __( 'The Network feature is already enabled.' ) );
 
 include( ABSPATH . 'wp-admin/includes/network.php' );
@@ -172 +169 @@
 function network_step2() {
     global $base, $wpdb;
-    if ( ! $_POST ) : ?>
+    if ( ! $_POST ) :
+        if ( is_multisite() ) : ?>
+    <div class="updated"><p><strong><?php _e( 'Notice: The Network feature is already enabled.' ); ?></strong> <?php _e( 'The original configuration steps are shown here for reference.' ); ?></p></div>
+<?php   else : ?>
     <div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
     <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
-<?php endif; ?>
         <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
         <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
         <div class="updated inline"><p><?php _e( '<strong>Caution:</strong> We recommend you backup your existing <code>wp-config.php</code> and <code>.htaccess</code> files.' ); ?></p></div>
+<?php
+        endif;
+    endif;
+?>
         <ol>
             <li><p><?php printf( __( 'Create a <code>blogs.dir</code> directory in <code>%s</code>. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); ?></p></li>
@@ -251 +254 @@
 </textarea></li>
         </ol>
+<?php if ( !is_multisite() ) { ?>
         <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?> <a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Return to Dashboard' ); ?></a></p>
 <?php
+    }
 }
 
@@ -270 +275 @@
     // create wp-config.php / htaccess
     network_step2();
-} elseif ( network_domain_check() ) {
+} elseif ( is_multisite() || network_domain_check() ) {
     network_step2();
 } else {