Changeset 33620

Timestamp:

08/17/2015 02:24:43 PM (11 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.

Location:

trunk/src

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/network/site-new.php (modified) (1 diff)
• wp-admin/network/site-users.php (modified) (1 diff)
• wp-admin/network/user-new.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (3 diffs)
• wp-includes/user.php (modified) (1 diff)

trunk/src/wp-admin/includes/user.php

@@ -177 +177 @@
         } else {
                 $user_id = wp_insert_user( $user );
-                wp_new_user_notification( $user_id );
+                wp_new_user_notification( $user_id, 'both' );
         }
         return $user_id;

trunk/src/wp-admin/network/site-new.php

@@ -80 +80 @@
                         wp_die( __( 'There was an error creating the user.' ) );
                 else
-                        wp_new_user_notification( $user_id, $password );
+                        wp_new_user_notification( $user_id, 'both' );
         }
 

trunk/src/wp-admin/network/site-users.php

@@ -78 +78 @@
                                         $update = 'err_new_dup';
                                 } else {
-                                        wp_new_user_notification( $user_id, $password );
+                                        wp_new_user_notification( $user_id, 'both' );
                                         add_user_to_blog( $id, $user_id, $_POST['new_role'] );
                                         $update = 'newuser';

trunk/src/wp-admin/network/user-new.php

@@ -52 +52 @@
                         $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                 } else {
-                        wp_new_user_notification( $user_id, $password );
+                        wp_new_user_notification( $user_id, 'both' );
                         wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                         exit;

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;

trunk/src/wp-includes/user.php

@@ -2620 +2620 @@
         update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
 
-        wp_new_user_notification( $user_id );
+        wp_new_user_notification( $user_id, 'both' );
 
         return $user_id;