Changeset 35575

Timestamp:

11/08/2015 03:15:07 AM (9 years ago)

Author:

jeremyfelt

Message:

MS: Allow "Network Admin Email" to be a non-user during network setup.

The network admin email setting for a network is often used as a catch-all or notification email separate from the actual user ID set as the owner of the new network. If a non-user email address is set during network installation, we can defer to the current user as the actual network admin and apply the entered email as the address to which general notifications are sent and emails are sent from.

In the future, we'll want to update the messaging around "Network Admin Email" to reflect its reality. See #34293.

Props jjeaton.
Fixes #34065.

File:

• trunk/src/wp-admin/includes/schema.php (modified) (3 diffs)

trunk/src/wp-admin/includes/schema.php

@@ -898 +898 @@
         $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.' ) );
@@ -904 +903 @@
     if ( $errors->get_error_code() )
         return $errors;
+
+    // If a user with the provided email does not exist, default to the current user as the new network admin.
+    $site_user = get_user_by( 'email', $email );
+    if ( false === $site_user ) {
+        $site_user = wp_get_current_user();
+    }
 
     // Set up site tables.
@@ -968 +973 @@
     $sitemeta = array(
         'site_name' => $site_name,
-        'admin_email' => $site_user->user_email,
+        'admin_email' => $email,
         'admin_user_id' => $site_user->ID,
         'registration' => 'none',