Changeset 49127

Timestamp:

10/11/2020 07:27:21 PM (4 years ago)

Author:

johnbillion

Message:

Networks and Sites: Extract into a new function the email that gets sent to the network administrator when a new site is created, and introduce filters to disable and modify its

contents.

• The send_new_site_email filter can be used to disable this email.
• The new_site_email filter can be used to modify its contents.

Props Dhruvin, Dharm1025, dharmin16, jipmoors

Fixes #42134

Location:

trunk/src

Files:

• wp-admin/network/site-new.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-admin/network/site-new.php

@@ -146 +146 @@
         }
 
-        wp_mail(
-            get_site_option( 'admin_email' ),
-            sprintf(
-                /* translators: New site notification email subject. %s: Network title. */
-                __( '[%s] New Site Created' ),
-                get_network()->site_name
-            ),
-            sprintf(
-                /* translators: New site notification email. 1: User login, 2: Site URL, 3: Site title. */
-                __(
-                    'New site created by %1$s
-
-Address: %2$s
-Name: %3$s'
-                ),
-                $current_user->user_login,
-                get_site_url( $id ),
-                wp_unslash( $title )
-            ),
-            sprintf(
-                'From: "%1$s" <%2$s>',
-                _x( 'Site Admin', 'email "From" field' ),
-                get_site_option( 'admin_email' )
-            )
-        );
+        wpmu_new_site_admin_notification( $id, $user_id );
         wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
         wp_redirect(

trunk/src/wp-includes/ms-functions.php

@@ -1688 +1688 @@
 
     wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     if ( $switched_locale ) {