WordPress.org

Make WordPress Core

Changeset 13929


Ignore:
Timestamp:
04/02/2010 03:24:18 AM (11 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

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

    r13926 r13929  
    6868    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.' ) );
    6969
    70 if ( get_option( 'siteurl' ) != get_option( 'home' ) )
    71     wp_die( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network.' ) );
    72 
    7370$title = __( 'Create a Network of WordPress Sites' );
    7471$parent_file = 'tools.php';
     
    9491 */
    9592function network_step1( $errors = false ) {
     93
     94    if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
     95        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>';
     96        include ('./admin-footer.php' );
     97        die();
     98    }
    9699
    97100    $active_plugins = get_option( 'active_plugins' );
Note: See TracChangeset for help on using the changeset viewer.