Ticket #11210: 11210.patch

wp-includes/user.php

@@ -2446 +2446 @@
 }
 
 /**
+ * Email the site admin a notification of a newly-registered user.
+ *
+ * @since unknown
+ *
+ * @param int $user_id User ID.
+ */
+function wp_new_user_registration_admin_notification( $user_id ) {
+
+        /**
+         * Filters whether to send the new user registration admin notification or not.
+         *
+         * @since unknown
+         *
+         * @param bool $should_send Whether to send the notification or not.
+         * @param int  $user_id     User ID.
+         */
+        $should_send = apply_filters( 'send_new_user_registration_admin_notification', true, $user_id );
+        if ( ! $should_send )
+                return;
+
+        $user = get_userdata( $user_id );
+
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // 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( __( 'E-mail: %s' ), $user->user_email ) . "\r\n";
+
+        $title = sprintf( __('[%s] New User Registration' ), $blogname );
+
+        /**
+         * Filter the subject of the new user registration admin notification.
+         *
+         * @since unknown
+         *
+         * @param string $title Default email title.
+         */
+        $title = apply_filters( 'new_user_registration_admin_title', $title );
+
+        /**
+         * Filter the message body of the new user registration admin notification.
+         *
+         * @since unknown
+         *
+         * @param string  $message    Default mail message.
+         * @param string  $user_login The username for the user.
+         * @param WP_User $user       WP_User object.
+         */
+        $message = apply_filters( 'new_user_registration_admin_message', $message, $user->user_login, $user );
+
+        @wp_mail( get_option('admin_email'), $title, $message );
+}
+
+/**
+ * Email login credentials to a newly-registered user.
+ *
+ * @since unknown
+ *
+ * @param int    $user_id        User ID.
+ * @param string $plaintext_pass Optional. The user's plaintext password. Default empty.
+ */
+function wp_new_user_registration_notification( $user_id, $plaintext_pass = '' ) {
+
+        /**
+         * Filters whether to send the new user registration admin notification or not.
+         *
+         * @since unknown
+         *
+         * @param bool $should_send Whether to send the notification or not.
+         * @param int  $user_id     User ID.
+         */
+        $should_send = apply_filters( 'send_new_user_registration_notification', true, $user_id );
+        if ( ! $should_send || empty( $plaintext_pass ) )
+                return;
+
+        $user = get_userdata( $user_id );
+
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // we want to reverse this for the plain text arena of emails.
+        $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+
+        $message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n";
+        $message .= sprintf( __( 'Password: %s' ), $plaintext_pass ) . "\r\n";
+        $message .= wp_login_url() . "\r\n";
+
+        $title = sprintf( __( '[%s] Your username and password' ) );
+
+        /**
+         * Filter the subject of the new user registration notification.
+         *
+         * @since unknown
+         *
+         * @param string $title Default email title.
+         */
+        $title = apply_filters( 'new_user_registration_title', $title );
+
+        /**
+         * Filter the message body of the new user registration notification.
+         *
+         * @since unknown
+         *
+         * @param string  $message        Default mail message.
+         * @param string  $user_login     The username for the user.
+         * @param string  $plaintext_pass The user's plaintext password.
+         * @param WP_User $user           WP_User object.
+         */
+        $message = apply_filters( 'new_user_registration_message', $message, $user->user_login, $plaintext_pass, $user );
+
+        wp_mail( $user->user_email, $title, $blogname, $message );
+}
+
+/**
  * Retrieve the current session token from the logged_in cookie.
  *
  * @since 4.0.0

wp-includes/pluggable.php

@@ -1685 +1685 @@
  * @param string $plaintext_pass Optional. The user's plaintext password. Default empty.
  */
 function wp_new_user_notification($user_id, $plaintext_pass = '') {
-        $user = get_userdata( $user_id );
-
-        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-        // 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(__('E-mail: %s'), $user->user_email) . "\r\n";
-
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
-
-        if ( empty($plaintext_pass) )
-                return;
-
-        $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);
-
+        wp_new_user_registration_admin_notification( $user_id );
+        wp_new_user_registration_notification( $user_id, $plaintext_pass );
 }
 endif;
 

wp-includes/pluggable-deprecated.php

@@ -189 +189 @@
                         _deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' );
                 }
         }
-}
- No newline at end of file
+}