Set base if we return to network step 2. props scribu, fixes #15620.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
37075f7f71
commit
75b43ead64
|
@ -307,6 +307,9 @@ function network_step2( $errors = false ) {
|
||||||
global $base, $wpdb;
|
global $base, $wpdb;
|
||||||
$hostname = get_clean_basedomain();
|
$hostname = get_clean_basedomain();
|
||||||
|
|
||||||
|
if ( ! isset( $base ) )
|
||||||
|
$base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
|
||||||
|
|
||||||
// Wildcard DNS message.
|
// Wildcard DNS message.
|
||||||
if ( is_wp_error( $errors ) )
|
if ( is_wp_error( $errors ) )
|
||||||
echo '<div class="error">' . $errors->get_error_message() . '</div>';
|
echo '<div class="error">' . $errors->get_error_message() . '</div>';
|
||||||
|
|
Loading…
Reference in New Issue