Changeset 33620 for trunk/src/wp-includes/pluggable.php

Timestamp:

08/17/2015 02:24:43 PM (10 years ago)

Author:

obenland

Message:

Passwords: Restore second parameter for wp_new_user_notification().

After [33023] users would always be notified, this restores previous behavior.

Props markjaquith, ocean90.
Fixes #33358.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1689 +1689 @@
  *
  * @since 2.0.0
- *
- * @param int    $user_id        User ID.
- */
-function wp_new_user_notification($user_id) {
+ * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
+ *
+ * @param int    $user_id User ID.
+ * @param string $notify  Whether admin and user should be notified ('both') or
+ *                        only the admin ('admin' or empty).
+ */
+function wp_new_user_notification( $user_id, $notify = '' ) {
     global $wpdb;
     $user = get_userdata( $user_id );
@@ -1706 +1709 @@
     @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 
+    if ( 'admin' === $notify || empty( $notify ) ) {
+        return;
+    }
+
     // Generate something random for a password reset key.
     $key = wp_generate_password( 20, false );
 
+    /** This action is documented in wp-login.php */
     do_action( 'retrieve_password_key', $user->user_login, $key );
 
@@ -1726 +1734 @@
 
     wp_mail($user->user_email, sprintf(__('[%s] Your username and password info'), $blogname), $message);
-
 }
 endif;