<!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>[13641] trunk/wp-admin: Correct subdomain handling in network.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13641">13641</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-10 08:17:07 +0000 (Wed, 10 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct subdomain handling in network.php. Pass around boolean values instead of 'yes' and 'no'. 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 (13640 => 13641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-03-10 08:08:27 UTC (rev 13640)
+++ trunk/wp-admin/includes/schema.php 2010-03-10 08:17:07 UTC (rev 13641)
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $network_id id of network to populate
</span><span class="cx"> */
</span><del>-function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $vhost = 'no' ) {
</del><ins>+function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
</ins><span class="cx"> global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
</span><span class="cx">
</span><span class="cx"> $msg = '';
</span><span class="lines">@@ -732,25 +732,25 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $vhost == 'yes' )
</del><ins>+ if ( $subdomain_install )
</ins><span class="cx"> update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
</span><span class="cx"> else
</span><span class="cx"> update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/');
</span><span class="cx">
</span><span class="cx"> $wp_rewrite->flush_rules();
</span><span class="cx">
</span><del>- if ( $vhost == 'yes' ) {
</del><ins>+ if ( $subdomain_install ) {
</ins><span class="cx"> $vhost_ok = false;
</span><span class="cx"> $hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
</span><span class="cx"> $page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
</span><del>- if ( is_object( $page ) && is_wp_error( $page ) ) {
</del><ins>+ if ( is_wp_error( $page ) ) {
</ins><span class="cx"> foreach ( $page->get_error_messages() as $err ) {
</span><span class="cx"> $errstr = $err;
</span><span class="cx"> }
</span><span class="cx"> } elseif( $page[ 'response' ][ 'code' ] == 200 ) {
</span><span class="cx"> $vhost_ok = true;
</span><span class="cx"> }
</span><del>- if ( !$vhost_ok ) {
</del><ins>+ if ( ! $vhost_ok ) {
</ins><span class="cx"> // @todo Update this to reflect the merge. Also: Multisite readme file, or remove the <blockquote> tags.
</span><span class="cx"> $msg = '<h2>' . esc_html__( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</h2>';
</span><span class="cx"> $msg .= '<p>' . __( 'To use the subdomain feature of WordPress MU you must have a wildcard entry in your dns. The installer attempted to contact a random hostname ($hostname) on your domain but failed. It returned this error message:' ) . '<br />';
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13640 => 13641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-10 08:08:27 UTC (rev 13640)
+++ trunk/wp-admin/network.php 2010-03-10 08:17:07 UTC (rev 13641)
</span><span class="lines">@@ -98,11 +98,11 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><del>- <th><label><input type='radio' name='vhost' value='yes'<?php checked( $rewrite_enabled ); ?> /> Sub-domains</label></th>
</del><ins>+ <th><label><input type='radio' name='subdomain_install' value='1'<?php checked( $rewrite_enabled ); ?> /> Sub-domains</label></th>
</ins><span class="cx"> <td><?php _e('like <code>site1.example.com</code> and <code>site2.example.com</code>'); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>- <th><label><input type='radio' name='vhost' value='no'<?php checked( ! $rewrite_enabled ); ?> /> Sub-directories</label></th>
</del><ins>+ <th><label><input type='radio' name='subdomain_install' value='0'<?php checked( ! $rewrite_enabled ); ?> /> Sub-directories</label></th>
</ins><span class="cx"> <td><?php _e('like <code>example.com/site1</code> and <code>example.com/site2</code>'); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -168,25 +168,31 @@
</span><span class="cx"> */
</span><span class="cx"> function network_step2() {
</span><span class="cx"> global $base, $wpdb;
</span><del>- if ( ! $_POST ) :
- if ( is_multisite() ) : ?>
</del><ins>+ if ( $_POST ) {
+ $vhost = (bool) $_POST['subdomain_install'];
+ } else {
+ if ( is_multisite() ) {
+ $vhost = is_subdomain_install();
+?>
</ins><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><del>-<?php else : ?>
</del><ins>+<?php } else {
+ $vhost = false; // @todo.
+?>
</ins><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><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>- endif;
- endif;
</del><ins>+ }
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <ol>
</span><span class="cx"> <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>
</span><span class="cx"> <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code>:' ), ABSPATH ); ?></p>
</span><span class="cx"> <textarea class="code" readonly="readonly" cols="100" rows="7">
</span><span class="cx"> define( 'MULTISITE', true );
</span><del>-define( 'VHOST', '<?php echo ( ! empty( $_POST['vhost'] ) && 'yes' == stripslashes( $_POST['vhost'] ) ) ? 'yes' : 'no'; ?>' );
</del><ins>+define( 'VHOST', '<?php echo $vhost ? 'yes' : 'no'; ?>' );
</ins><span class="cx"> $base = '<?php echo $base; ?>';
</span><span class="cx"> define( 'DOMAIN_CURRENT_SITE', '<?php echo get_clean_basedomain(); ?>' );
</span><span class="cx"> define( 'PATH_CURRENT_SITE', '<?php echo $base; ?>' );
</span><span class="lines">@@ -259,19 +265,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+$base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
+
</ins><span class="cx"> if ( $_POST ) {
</span><span class="cx"> check_admin_referer( 'install-network-1' );
</span><span class="cx">
</span><del>- // Install!
- $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
-
</del><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><span class="cx"> // create network tables
</span><span class="cx"> install_network();
</span><span class="cx"> $hostname = get_clean_basedomain();
</span><del>- $vhost = 'localhost' == $hostname ? false : (bool) $_POST['vhost'];
</del><ins>+ $subdomain_install = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
</ins><span class="cx"> if ( ! network_domain_check() )
</span><del>- populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $vhost );
</del><ins>+ populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $subdomain_install );
</ins><span class="cx"> // create wp-config.php / htaccess
</span><span class="cx"> network_step2();
</span><span class="cx"> } elseif ( is_multisite() || network_domain_check() ) {
</span></span></pre>
</div>
</div>
</body>
</html>