Ticket #42133: 42133.1.diff

src/wp-admin/includes/upgrade.php

@@ -543 +543 @@
          */
         function wp_new_blog_notification( $blog_title, $blog_url, $user_id, $password ) {
                 $user      = new WP_User( $user_id );
-                $email     = $user->user_email;
-                $name      = $user->user_login;
+                $username  = $user->user_login;
                 $login_url = wp_login_url();
-                /* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
-                $message = sprintf(
-                        __(
-                                'Your new WordPress site has been successfully set up at:
 
-%1$s
+                /* translators: New site notification email. Do not translate SITEURL, USERNAME, PASSWORD, LOGINURL: those are placeholders. */
+                $new_blog_text = __( 'Your new WordPress site has been successfully set up at:
+
+###SITEURL###
 
 You can log in to the administrator account with the following information:
 
-Username: %2$s
-Password: %3$s
-Log in here: %4$s
+Username: ###USERNAME###
+Password: ###PASSWORD###
+Log in here: ###LOGINURL###
 
 We hope you enjoy your new site. Thanks!
 
 --The WordPress Team
 https://wordpress.org/
-'
-                        ), $blog_url, $name, $password, $login_url
+');
+
+                $new_blog_email = array(
+                        'to'      => $user->user_email,
+                        /* translators: New site notification email subject. 1: Site name */
+                        'subject' => __( '[%s] New WordPress Site' ),
+                        'message' => $new_blog_text,
+                        'headers' => '',
+                );
+
+                /**
+                 * Filters the contents of the email sent when the new blog is created.
+                 *
+                 * @since 5.0
+                 *
+                 * @param array $new_blog_email {
+                 *            Used to build wp_mail().
+                 *            @type string $to      The intended recipients. Add emails in a comma separated string.
+                 *            @type string $subject The subject of the email.
+                 *            @type string $message The content of the email.
+                 *                The following strings have a special meaning and will get replaced dynamically:
+                 *                - ###SITEURL###     The URL of the new created site.
+                 *                - ###USERNAME###    The site administrator's username.
+                 *                - ###PASSWORD###    The site administrator's password.
+                 *                - ###LOGINURL###        The Login URL of the site.
+                 *            @type string $headers Headers. Add headers in a newline (\r\n) separated string.
+                 *        }
+                 * @param WP_User $user       The site administrator object.
+                 * @param string  $blog_name  The site title.
+                 * @param string  $blog_url   The site URL.
+                 * @param string  $password   The site administrator's password.
+                 *
+                 */
+                $new_blog_email = apply_filters( 'new_blog_email', $new_blog_email, $user, $blog_title, $blog_url, $password );
+
+                // Replace placeholders with the data.
+                $new_blog_email['message'] = str_replace(
+                        array(
+                                '###SITEURL###',
+                                '###USERNAME###',
+                                '###PASSWORD###',
+                                '###LOGINURL###',
+                        ),
+                        array(
+                                $blog_url,
+                                $username,
+                                $password,
+                                $login_url,
+                        ),
+                        $new_blog_email['message']
                 );
 
-                @wp_mail( $email, __( 'New WordPress Site' ), $message );
+                wp_mail( $new_blog_email['to'], sprintf( $new_blog_email['subject'], $blog_title ), $new_blog_email['message'], $new_blog_email['headers'] );
         }
 endif;