Ticket #44781: 44781.diff

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

@@ -142 +142 @@
                         update_user_option( $user_id, 'primary_blog', $id, true );
                 }
 
-                wp_mail(
-                        get_site_option( 'admin_email' ),
-                        sprintf(
-                                /* translators: %s: network name */
-                                __( '[%s] New Site Created' ),
-                                get_network()->site_name
-                        ),
-                        sprintf(
-                                /* translators: 1: user login, 2: site url, 3: site name/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_admin_notification( $id, $user_id, $title );
                 wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
                 wp_redirect(
                         add_query_arg(

src/wp-includes/ms-functions.php

@@ -1590 +1590 @@
 }
 
 /**
+ * Notify the admin about new site creation.
+ *
+ * Filter {@see 'wpmu_admin_notification'} to disable or bypass.
+ *
+ * Filter {@see 'update_admin_notification'} and {@see 'update_admin_notification_subject'} to
+ * modify the content and subject line of the notification email.
+ *
+ * @param int    $blog_id    Site ID.
+ * @param int    $user_id    User ID.
+ * @param string $title       Site title.
+ * @return bool
+ */
+function wpmu_admin_notification( $blog_id, $user_id, $title ) {
+        $current_network = get_network();
+
+        /**
+         * Filters whether to bypass the admin notification email.
+         *
+         * Returning false disables the admin notification email.
+         *
+         * @param int|bool  $blog_id    Site ID.
+         * @param int       $user_id    User ID.
+         * @param string    $title      Site title.
+         */
+        if ( ! apply_filters( 'wpmu_admin_notification', $blog_id, $user_id, $title ) ) {
+                return false;
+        }
+
+        $user = get_userdata( $user_id );
+
+        $admin_notification = sprintf(
+                /* translators: 1: user login, 2: site url, 3: site name/title */
+                __(
+                        'New site created by %1$s
+
+Address: %2$s
+Name: %3$s'
+                ),
+                $user->user_login,
+                get_site_url( $blog_id ),
+                wp_unslash( $title )
+        );
+
+        /**
+         * Filters the content of the admin notification email.
+         *
+         * Content should be formatted for transmission via wp_mail().
+         *
+         * @param string $admin_notification Message body of the email.
+         * @param int    $blog_id            Site ID.
+         * @param int    $user_id            User ID.
+         * @param string $title              Site title.
+         */
+        $admin_notification = apply_filters( 'update_admin_notification', $admin_notification, $blog_id, $user_id, $title );
+        $admin_email        = get_site_option( 'admin_email' );
+
+        if ( empty( $admin_email ) ) {
+                $admin_email = sanitize_email( 'support@' . $_SERVER['SERVER_NAME'] );
+        }
+
+        $message_headers = sprintf(
+                'From: "%1$s" <%2$s>',
+                _x( 'Site Admin', 'email "From" field' ),
+                sanitize_email( $admin_email )
+        );
+
+        $message = $admin_notification;
+
+        if ( empty( $current_network->site_name ) ) {
+                $current_network->site_name = 'WordPress';
+        }
+
+        /* translators: New site notification email subject. 1: Network name, 2: New site name */
+        $subject = sprintf(
+                /* translators: %s: network name */
+                __( '[%s] New Site Created' ),
+                $current_network->site_name
+        );
+
+        /**
+         * Filters the subject of the admin notification email.
+         *
+         * @param string $subject Subject of the email.
+         */
+        $subject = apply_filters( 'update_admin_notification_subject', sprintf( $subject, $current_network->site_name, wp_unslash( $title ) ) );
+        wp_mail( $admin_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+
+        return true;
+}
+
+/**
  * Notify a user that their blog activation has been successful.
  *
  * Filter {@see 'wpmu_welcome_notification'} to disable or bypass.