<!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>[13572] trunk/wp-admin/network.php: Second pass,
replacing accidental ms-config-sample.php change with wp-config.ms.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13572">13572</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-03 07:57:44 +0000 (Wed, 03 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Second pass, replacing accidental ms-config-sample.php change with wp-config.ms. see <a href="http://trac.wordpress.org/ticket/12094">#12094</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 (13571 => 13572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-03 07:43:32 UTC (rev 13571)
+++ trunk/wp-admin/network.php 2010-03-03 07:57:44 UTC (rev 13572)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> add_contextual_help( $current_screen, __( '<a href="http://codex.wordpress.org/Settings_Network_SubPanel" target="_blank">Network Settings</a>') );
</span><span class="cx">
</span><span class="cx"> include( './admin-header.php' );
</span><del>-
-$dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' );
</del><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="lines">@@ -48,7 +46,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><del>-function ms_network_step1() {
</del><ins>+function network_step1() {
</ins><span class="cx">
</span><span class="cx"> $active_plugins = get_option( 'active_plugins' );
</span><span class="cx"> if ( ! empty( $active_plugins ) ) {
</span><span class="lines">@@ -69,9 +67,10 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
</span><del>- <p><?php _e( "Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. We'll create configuration files in the next step." ); ?></p>
</del><ins>+ <p><?php _e( "Fill in the information below and you'll be on your way to creating a network of WordPress sites. We'll create configuration files in the next step." ); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx">
</span><ins>+ // @todo IIS...
</ins><span class="cx"> if ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
</span><span class="cx"> $rewrite_enabled = true;
</span><span class="cx"> } else {
</span><span class="lines">@@ -165,7 +164,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><del>-function ms_network_step2() {
</del><ins>+function network_step2() {
</ins><span class="cx"> global $base, $wpdb;
</span><span class="cx"> ?>
</span><span class="cx"> <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
</span><span class="lines">@@ -176,7 +175,7 @@
</span><span class="cx"> $vhost = stripslashes( $_POST['vhost' ] );
</span><span class="cx"> $prefix = $wpdb->base_prefix;
</span><span class="cx">
</span><del>- $config_sample = ABSPATH . 'wp-admin/includes/ms-config-sample.php';
</del><ins>+ $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms';
</ins><span class="cx"> if ( ! file_exists( $config_sample ) )
</span><span class="cx"> wp_die( sprintf( __( 'Sorry, I need a <code>%s</code> to work from. Please re-upload this file to your WordPress installation.' ), $config_sample ) );
</span><span class="cx">
</span><span class="lines">@@ -262,7 +261,7 @@
</span><span class="cx"> <li><p><?php printf( __( 'Replace the contents of your <code>%s.htaccess</code> with the following:' ), ABSPATH ); ?></p>
</span><span class="cx"> <textarea name="htaccess" cols="120" rows="20">
</span><span class="cx"> <?php echo wp_htmledit_pre( $htaccess_file ); ?>
</span><del>- </textarea>
</del><ins>+</textarea>
</ins><span class="cx"> </li>
</span><span class="cx"> </ol>
</span><span class="cx"> <?php
</span><span class="lines">@@ -283,11 +282,11 @@
</span><span class="cx"> if ( !network_domain_check() || $_POST['existing_network'] == '0' )
</span><span class="cx"> populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $_POST['vhost'] );
</span><span class="cx"> // create wp-config.php / htaccess
</span><del>- ms_network_step2();
</del><ins>+ network_step2();
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- ms_network_step1();
</del><ins>+ network_step1();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>