Ticket #47021: 47021.diff

src/wp-includes/ms-functions.php

@@ -206 +206 @@
          * @param int    $blog_id Blog ID.
          */
         do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
-        wp_cache_delete( $user_id, 'users' );
+        clean_user_cache( $user_id );
         wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
         restore_current_blog();
         return true;

src/wp-includes/pluggable.php

@@ -2504 +2504 @@
                         array( 'ID' => $user_id )
                 );
 
-                wp_cache_delete( $user_id, 'users' );
+                clean_user_cache( $user_id );
         }
 endif;
 

src/wp-includes/user.php

@@ -1830 +1830 @@
         } elseif ( ! $update ) {
                 $user->set_role( get_option( 'default_role' ) );
         }
-        wp_cache_delete( $user_id, 'users' );
-        wp_cache_delete( $user_login, 'userlogins' );
+
+        clean_user_cache( $user_id );
 
         if ( $update ) {
                 /**