Index: src/wp-admin/includes/network.php
===================================================================
--- src/wp-admin/includes/network.php (revision 35205)
+++ src/wp-admin/includes/network.php (working copy)
@@ -278,7 +278,7 @@
-
+
|
Index: src/wp-admin/includes/schema.php
===================================================================
--- src/wp-admin/includes/schema.php (revision 35205)
+++ src/wp-admin/includes/schema.php (working copy)
@@ -900,7 +900,6 @@
if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
- $site_user = get_user_by( 'email', $email );
if ( ! is_email( $email ) )
$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
@@ -907,6 +906,12 @@
if ( $errors->get_error_code() )
return $errors;
+ // Attempt to get a user with the provided email, default to the current user.
+ $site_user = get_user_by( 'email', $email );
+ if ( false === $site_user ) {
+ $site_user = wp_get_current_user();
+ }
+
// Set up site tables.
$template = get_option( 'template' );
$stylesheet = get_option( 'stylesheet' );
@@ -970,7 +975,7 @@
$sitemeta = array(
'site_name' => $site_name,
- 'admin_email' => $site_user->user_email,
+ 'admin_email' => $email,
'admin_user_id' => $site_user->ID,
'registration' => 'none',
'upload_filetypes' => implode( ' ', $upload_filetypes ),