Ticket #36009: 36009.diff

src/wp-includes/pluggable.php

@@ -1698 +1698 @@
  * @param int    $user_id    User ID.
  * @param null   $deprecated Not used (argument deprecated).
  * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
- *                           string (admin only), or 'both' (admin and user). Default empty.
+ *                           string (admin only), 'user', or 'both' (admin and user). Default empty.
  */
 function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
         if ( $deprecated !== null ) {
@@ -1712 +1712 @@
         // we want to reverse this for the plain text arena of emails.
         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-        $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(__('Email: %s'), $user->user_email) . "\r\n";
+        if ( 'user' !== $notify ) {
+                $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( __( 'Email: %s' ), $user->user_email ) . "\r\n";
 
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+                @wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] New User Registration' ), $blogname ), $message );
+        }
 
         // `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notifcation.
         if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {