<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13642] trunk/wp-admin: Store subdomain/subdirectory choice in sitemeta.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13642">13642</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-10 08:34:42 +0000 (Wed, 10 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Store subdomain/subdirectory choice in sitemeta. For now, only used in case we return to network.php without constants. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (13641 => 13642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-03-10 08:17:07 UTC (rev 13641)
+++ trunk/wp-admin/includes/schema.php 2010-03-10 08:34:42 UTC (rev 13642)
</span><span class="lines">@@ -702,7 +702,8 @@
</span><span class="cx"> // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
</span><span class="cx"> 'siteurl' => get_option( 'siteurl' ),
</span><span class="cx"> 'add_new_users' => '0',
</span><del>- 'upload_space_check_disabled' => '0'
</del><ins>+ 'upload_space_check_disabled' => '0',
+ 'subdomain_install' => intval( $subdomain_install ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $insert = '';
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13641 => 13642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-10 08:17:07 UTC (rev 13641)
+++ trunk/wp-admin/network.php 2010-03-10 08:34:42 UTC (rev 13642)
</span><span class="lines">@@ -168,23 +168,29 @@
</span><span class="cx"> */
</span><span class="cx"> function network_step2() {
</span><span class="cx"> global $base, $wpdb;
</span><ins>+ $hostname = get_clean_basedomain();
</ins><span class="cx"> if ( $_POST ) {
</span><del>- $vhost = (bool) $_POST['subdomain_install'];
</del><ins>+ $vhost = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
</ins><span class="cx"> } else {
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $vhost = is_subdomain_install();
</span><span class="cx"> ?>
</span><span class="cx"> <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>
</span><span class="cx"> <?php } else {
</span><del>- $vhost = false; // @todo.
</del><ins>+ $vhost = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="error"><p><strong><?php _e('Warning:'); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
</span><span class="cx"> <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>
</span><ins>+<?php
+ }
+ }
+
+ if ( $_POST || ! is_multisite() ) {
+?>
</ins><span class="cx"> <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
</span><span class="cx"> <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
</span><span class="cx"> <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>
</span><span class="cx"> <?php
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <ol>
</span><span class="lines">@@ -194,7 +200,7 @@
</span><span class="cx"> define( 'MULTISITE', true );
</span><span class="cx"> define( 'VHOST', '<?php echo $vhost ? 'yes' : 'no'; ?>' );
</span><span class="cx"> $base = '<?php echo $base; ?>';
</span><del>-define( 'DOMAIN_CURRENT_SITE', '<?php echo get_clean_basedomain(); ?>' );
</del><ins>+define( 'DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>' );
</ins><span class="cx"> define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' );
</span><span class="cx"> define( 'SITE_ID_CURRENT_SITE', 1 );
</span><span class="cx"> define( 'BLOG_ID_CURRENT_SITE', 1 );</textarea>
</span></span></pre>
</div>
</div>
</body>
</html>