Changeset 13929

Timestamp:

04/02/2010 03:24:18 AM (13 years ago)

Author:

nacin

Message:

Switch from wp_die() to a nice error message for siteurl!=home for network.php. see #12736

File:

• trunk/wp-admin/network.php (modified) (2 diffs)

trunk/wp-admin/network.php

@@ -68 +68 @@
     wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> 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 <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network.' ) );
-
 $title = __( 'Create a Network of WordPress Sites' );
 $parent_file = 'tools.php';
@@ -94 +91 @@
  */
 function network_step1( $errors = false ) {
+
+    if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
+        echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</strong></p></div>';
+        include ('./admin-footer.php' );
+        die();
+    }
 
     $active_plugins = get_option( 'active_plugins' );