diff --git a/wp-admin/network.php b/wp-admin/network.php
index 08ea513ef..ac8c471b4 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -67,9 +67,6 @@ function get_clean_basedomain() {
if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
wp_die( __( 'You must define the WP_ALLOW_MULTISITE
constant as true in your wp-config.php file to allow creation of a Network.' ) );
-if ( get_option( 'siteurl' ) != get_option( 'home' ) )
- wp_die( __( 'Your WordPress address must match your Site address before creating a Network.' ) );
-
$title = __( 'Create a Network of WordPress Sites' );
$parent_file = 'tools.php';
@@ -94,6 +91,12 @@ include( './admin-header.php' );
*/
function network_step1( $errors = false ) {
+ if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
+ echo '
' . __('Error:') . ' ' . sprintf( __( 'Your WordPress address must match your Site address before creating a Network. See General Settings.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '
' . __('Warning:') . ' ' . sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php' ) ) . '
' . __(' Once the network is created, you may reactivate your plugins.' ) . '
';