<!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>[13633] trunk/wp-admin/network.php: Jump right to network.
php step 2 when an existing network is present.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13633">13633</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-09 18:58:05 +0000 (Tue, 09 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Jump right to network.php step 2 when an existing network is present. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13632 => 13633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-09 18:19:28 UTC (rev 13632)
+++ trunk/wp-admin/network.php 2010-03-09 18:58:05 UTC (rev 13633)
</span><span class="lines">@@ -81,17 +81,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_nonce_field( 'install-network-1' );
</span><del>- if ( network_domain_check() ) { ?>
- <h3><?php esc_html_e( 'Existing Network' ); ?></h3>
- <div class="updated inline"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'An existing network was detected.' ); ?></p></div>
- <p class="existing-network">
- <label><input type='checkbox' name='existing_network' value='1' /> <?php _e( 'Yes, keep the existing network of sites.' ); ?></label><br />
- </p>
-<?php } else { ?>
- <input type='hidden' name='existing_network' value='0' />
-<?php } ?>
- <input type='hidden' name='action' value='step2' />
-<?php if ( 'localhost' != $hostname ) : ?>
</del><ins>+
+ if ( 'localhost' != $hostname ) : ?>
</ins><span class="cx"> <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
</span><span class="cx"> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
</span><span class="cx"> <p><?php _e( "You will need a wildcard DNS record if you're going to use the virtual host (sub-domain) functionality." ); ?></p>
</span><span class="lines">@@ -110,8 +101,8 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>- <?php
- endif;
</del><ins>+<?php
+ endif;
</ins><span class="cx">
</span><span class="cx"> $is_www = ( substr( $hostname, 0, 4 ) == 'www.' );
</span><span class="cx"> if ( $is_www ) :
</span><span class="lines">@@ -171,7 +162,10 @@
</span><span class="cx"> */
</span><span class="cx"> function network_step2() {
</span><span class="cx"> global $base, $wpdb;
</span><del>-?>
</del><ins>+ if ( ! $_POST ) : ?>
+ <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; ?>
</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="lines">@@ -251,29 +245,25 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$action = isset( $_POST['action'] ) ? $_POST['action'] : null;
</del><ins>+if ( $_POST ) {
+ check_admin_referer( 'install-network-1' );
</ins><span class="cx">
</span><del>-switch ( $action ) {
- case 'step2':
- check_admin_referer( 'install-network-1' );
</del><ins>+ // Install!
+ $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
</ins><span class="cx">
</span><del>- // Install!
- $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
-
- require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
- // create network tables
- install_network();
- $hostname = get_clean_basedomain();
- $vhost = 'localhost' == $hostname ? false : (bool) $_POST['vhost'];
- if ( !network_domain_check() || isset( $_POST['existing_network'] ) && $_POST['existing_network'] == '0' )
- populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $vhost );
- // create wp-config.php / htaccess
- network_step2();
- break;
-
- default:
- network_step1();
- break;
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+ // create network tables
+ install_network();
+ $hostname = get_clean_basedomain();
+ $vhost = 'localhost' == $hostname ? false : (bool) $_POST['vhost'];
+ if ( ! network_domain_check() )
+ populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $vhost );
+ // create wp-config.php / htaccess
+ network_step2();
+} elseif ( network_domain_check() ) {
+ network_step2();
+} else {
+ network_step1();
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </form>
</span></span></pre>
</div>
</div>
</body>
</html>