WordPress.org

Make WordPress Core

Changeset 13572


Ignore:
Timestamp:
03/03/2010 07:57:44 AM (11 years ago)
Author:
nacin
Message:

Second pass, replacing accidental ms-config-sample.php change with wp-config.ms. see #12094

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/network.php

    r13571 r13572  
    3232
    3333include( './admin-header.php' );
    34 
    35 $dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' );
    3634?>
    3735<div class="wrap">
     
    4947 * @since 3.0.0
    5048 */
    51 function ms_network_step1() {
     49function network_step1() {
    5250
    5351    $active_plugins = get_option( 'active_plugins' );
     
    7068    ?>
    7169    <p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
    72     <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>
     70    <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>
    7371    <?php
    7472
     73    // @todo IIS...
    7574    if ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
    7675        $rewrite_enabled = true;
     
    166165 * @since 3.0.0
    167166 */
    168 function ms_network_step2() {
     167function network_step2() {
    169168    global $base, $wpdb;
    170169?>
     
    177176    $prefix  = $wpdb->base_prefix;
    178177
    179     $config_sample = ABSPATH . 'wp-admin/includes/ms-config-sample.php';
     178    $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms';
    180179    if ( ! file_exists( $config_sample ) )
    181180        wp_die( sprintf( __( 'Sorry, I need a <code>%s</code> to work from. Please re-upload this file to your WordPress installation.' ), $config_sample ) );
     
    263262                <textarea name="htaccess" cols="120" rows="20">
    264263<?php echo wp_htmledit_pre( $htaccess_file ); ?>
    265                 </textarea>
     264</textarea>
    266265            </li>
    267266        </ol>
     
    284283            populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['weblog_title'], $base, $_POST['vhost'] );
    285284        // create wp-config.php / htaccess
    286         ms_network_step2();
     285        network_step2();
    287286        break;
    288287
    289288    default:
    290         ms_network_step1();
     289        network_step1();
    291290        break;
    292291}
Note: See TracChangeset for help on using the changeset viewer.