diff --git a/wp-admin/network.php b/wp-admin/network.php
index 72be7cd2a..f3ead94d6 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -31,8 +31,6 @@ $parent_file = 'tools.php';
add_contextual_help( $current_screen, __( 'Network Settings') );
include( './admin-header.php' );
-
-$dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' );
?>
@@ -48,7 +46,7 @@ $dirs = array( substr( ABSPATH, 0, -1 ), ABSPATH . 'wp-content' );
*
* @since 3.0.0
*/
-function ms_network_step1() {
+function network_step1() {
$active_plugins = get_option( 'active_plugins' );
if ( ! empty( $active_plugins ) ) {
@@ -69,9 +67,10 @@ function ms_network_step1() {
?>
-
+
@@ -176,7 +175,7 @@ function ms_network_step2() {
$vhost = stripslashes( $_POST['vhost' ] );
$prefix = $wpdb->base_prefix;
- $config_sample = ABSPATH . 'wp-admin/includes/ms-config-sample.php';
+ $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms';
if ( ! file_exists( $config_sample ) )
wp_die( sprintf( __( 'Sorry, I need a
%s
to work from. Please re-upload this file to your WordPress installation.' ), $config_sample ) );
@@ -262,7 +261,7 @@ function ms_network_step2() {
%s.htaccess with the following:' ), ABSPATH ); ?>
+