Ticket #11210: 11210_pluggable.php.adds-hooks.patch

pluggable.php

@@ -1138 +1138 @@
 if ( !function_exists('wp_new_user_notification') ) :
 /**
  * Notify the blog admin of a new user, normally via email.
+ * Also sends email to new user with plaintext password.
  *
  * @since 2.0
+ * @uses apply_filters() Calls 'wp_new_user_notification_admin' hook on an array of all of admin mail parameters.
+ * @uses apply_filters() Calls 'wp_new_user_notification_user' hook on an array of all of user mail parameters.
  *
  * @param int $user_id User ID
  * @param string $plaintext_pass Optional. The user's plaintext password
+ *
  */
 function wp_new_user_notification($user_id, $plaintext_pass = '') {
         $user = new WP_User($user_id);
 
-        $user_login = stripslashes($user->user_login);
-        $user_email = stripslashes($user->user_email);
+        $user_login = stripslashes( $user->user_login );
+        $user_email = stripslashes( $user->user_email );
 
-        $message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
-        $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-        $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
+        $message  = sprintf( __('New user registration on your blog %s:'), get_option( 'blogname' ) ) . "\r\n\r\n";
+        $message .= sprintf( __('Username: %s'), $user_login ) . "\r\n\r\n";
+        $message .= sprintf( __('E-mail: %s'), $user_email ) . "\r\n";
 
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
+        $subject = sprintf(__('[%s] New User Registration'), get_option('blogname') );
+        $to = get_option( 'admin_email' );
 
-        if ( empty($plaintext_pass) )
+        $send = true;
+        extract( apply_filters( 'wp_new_user_notification_admin', compact( 'send', 'to', 'subject', 'message' ) ) );
+
+        if ( $send )
+                @wp_mail(get_option('admin_email'), $subject, $message);
+
+        if ( empty( $plaintext_pass) ) )
                 return;
 
         $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
         $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
         $message .= wp_login_url() . "\r\n";
 
-        wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);
+        $subject = sprintf( __('[%s] Your username and password'), get_option( 'blogname' ) );
 
+        $send = true;
+        extract( apply_filters( 'wp_new_user_notification_user', compact( 'send', 'to', 'subject', 'message' ) ) );
+
+        if ( $send )
+                wp_mail($user_email, $subject, $message);
+
 }
 endif;