Ticket #33759: 33579.patch

wp-includes/user-functions.php

@@ -1330 +1330 @@
          */
         if ( in_array( $user_login, apply_filters( 'illegal_user_logins', array() ) ) ) {
                 return new WP_Error( 'illegal_user_login', __( 'Sorry, that username is not allowed.' ) );
-        }       
+        }
 
         /*
          * If a nicename is provided, remove unsafe user characters before using it.
@@ -1636 +1636 @@
                  * @param array $userdata The updated user array.
                  *
                  */
-                $send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
+                $send_password_change_email = apply_filters( 'send_password_change_email', ! current_user_can( 'manage_options' ), $user, $userdata );
         }
 
         if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
@@ -1652 +1652 @@
                  * @param array $userdata The updated user array.
                  *
                  */
-                $send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
+                $send_email_change_email = apply_filters( 'send_email_change_email', ! current_user_can( 'manage_options' ), $user, $userdata );
         }
 
         wp_cache_delete( $user['user_email'], 'useremail' );