Ticket #11210: 11210.2.diff

wp-includes/pluggable.php

@@ -1287 +1287 @@
         // we want to reverse this for the plain text arena of emails.
         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
+        $subject = sprintf( __( '[%s] New User Registration', $blogname ) );
+        $email = get_option( 'admin_email' );
+
         $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
         $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
         $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
 
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+        /**
+         * Fires before sending a new user notification by email to that blog's admin.
+         *
+         * To override the email, or cancel it altogether, apply your custom logic
+         * and return false.
+         *
+         * @since 3.9.0
+         *
+         * @param boolean $send return false to prevent WP from sending an email
+         * @param int $user_id User ID
+         * @param string $plaintext_pass Optional. The user's plaintext password
+         */
+        if ( apply_filters( 'wp_new_user_notification_admin', true, $user_id, $plaintext_pass ) ) {
+                WP_DEBUG ? wp_mail( $email, $subject, $message ) : @wp_mail( $email, $subject, $message );
+        }
 
         if ( empty($plaintext_pass) )
                 return;
 
+        $subject = sprintf( __( '[%s] Your username and password' ), $blogname );
+        $email = $user->user_email;
+
         $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
         $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
         $message .= wp_login_url() . "\r\n";
 
-        wp_mail($user->user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
-
+        /**
+         * Fires before sending a new user notification by email to that new user.
+         *
+         * To override the email, or cancel it altogether, apply your custom logic
+         * and return false.
+         *
+         * @since 3.9.0
+         *
+         * @param boolean $send return false to prevent WP from sending an email
+         * @param int $user_id User ID
+         * @param string $plaintext_pass Optional. The user's plaintext password
+         */
+        if ( apply_filters( 'wp_new_user_notification_user', true, $user_id, $plaintext_pass ) ) {
+                WP_DEBUG ? wp_mail( $email, $subject, $message ) : @wp_mail( $email, $subject, $message );
+        }
 }
 endif;