Changeset 13642

Timestamp:

03/10/2010 08:34:42 AM (15 years ago)

Author:

nacin

Message:

Store subdomain/subdirectory choice in sitemeta. For now, only used in case we return to network.php without constants. see #11816

Location:

trunk/wp-admin

Files:

• includes/schema.php (modified) (1 diff)
• network.php (modified) (3 diffs)

trunk/wp-admin/includes/schema.php

@@ -703 +703 @@
         'siteurl' => get_option( 'siteurl' ),
         'add_new_users' => '0',
-        'upload_space_check_disabled' => '0'
+        'upload_space_check_disabled' => '0',
+        'subdomain_install' => intval( $subdomain_install ),
     );
 

trunk/wp-admin/network.php

@@ -169 +169 @@
 function network_step2() {
     global $base, $wpdb;
+    $hostname = get_clean_basedomain();
     if ( $_POST ) {
-        $vhost = (bool) $_POST['subdomain_install'];
+        $vhost = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
     } else {
         if ( is_multisite() ) {
@@ -177 +178 @@
     <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 {
-            $vhost = false; // @todo.
+            $vhost = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
 ?>
     <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
+        }
+    }
+
+    if ( $_POST || ! is_multisite() ) {
+?>
         <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
-        }
     }
 ?>
@@ -195 +201 @@
 define( 'VHOST', '<?php echo $vhost ? 'yes' : 'no'; ?>' );
 $base = '<?php echo $base; ?>';
-define( 'DOMAIN_CURRENT_SITE', '<?php echo get_clean_basedomain(); ?>' );
+define( 'DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>' );
 define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' );
 define( 'SITE_ID_CURRENT_SITE', 1 );