Ticket #26317: wordpress.patch

wp-includes/ms-functions.php

@@ -1524 +1524 @@
 }
 
 /**
+ * Notify the network administration email that a new blog has been created on the network.
+ *
+ * Filter 'wp_admin_new_site_notification' to disable or bypass.
+ *
+ * Filter 'update_new_site_notification_email' and 'update_new_site_notification_subject' to
+ * modify the content and subject line of the notification email.
+ *
+ * @since 3.9
+ *
+ * @param string $blog_id The ID of the new blog
+ * @param string $user_id The user who created the new blog
+ * @param string $title The new blog's title
+ * @return bool
+ */
+function wp_admin_new_site_notification( $blog_id, $user_id, $title ) {
+        $current_site = get_current_site();
+        $user = get_userdata( $user_id );
+        
+        $url = get_blogaddress_by_id($blog_id);
+        $user_name = $user->user_login;
+
+        if ( !apply_filters('wp_admin_new_site_notification', $user_name, $url, $title) )
+                return false;
+
+        $content_mail = sprintf( __( 'New site created by %1$s
+
+Address: %2$s
+Name: %3$s' ), $user_name , $url, wp_unslash($title) );
+        
+        $content_mail = apply_filters( 'update_new_site_notification_email', $user_name, $add, $title);
+        
+        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+        $from_email = get_site_option( 'admin_email' );
+
+        $message_headers = "From: \"{$from_name}\" <{$from_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+        $message = $content_mail;
+        
+        if ( empty( $current_site->site_name ) )
+                $current_site->site_name = 'WordPress';
+
+        $subject = apply_filters( 'update_new_site_notification_subject', sprintf( __('[%s] New Site Created' ), $current_site->site_name) );
+        wp_mail( get_site_option( 'admin_email' ), $subject, $message, $message_headers );
+        return true;            
+}
+
+/**
  * Notify a user that their account activation has been successful.
  *
  * Filter 'wpmu_welcome_user_notification' to disable or bypass.

wp-admin/network/site-new.php

@@ -84 +84 @@
         if ( !is_wp_error( $id ) ) {
                 if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
                         update_user_option( $user_id, 'primary_blog', $id, true );
-                $content_mail = sprintf( __( 'New site created by %1$s
-
-Address: %2$s
-Name: %3$s' ), $current_user->user_login , get_site_url( $id ), wp_unslash( $title ) );
-                wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
+                wp_admin_new_site_notification( $id, $user_id, $title );
                 wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
                 wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
                 exit;