Changeset 20581 for trunk/wp-admin/includes/user.php

Timestamp:

04/24/2012 10:13:47 PM (14 years ago)

Author:

ryan

Message:

• Return empty arrays instead of false for all conditions in get_blogs_of_user().
• When deleting a user, use a delete_metadata_by_mid() loop over the meta so that the meta cache is cleared.
• Use remove_user_from_blog() for DRYness.

Props nacin, duck_
Fixes #19500

File:

• trunk/wp-admin/includes/user.php (modified) (1 diff)

trunk/wp-admin/includes/user.php

@@ -265 +265 @@
 
         // FINALLY, delete user
-        if ( !is_multisite() ) {
-                $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
+        if ( is_multisite() ) {
+                remove_user_from_blog( $id, get_current_blog_id() );
+        } else {
+                $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+                foreach ( $meta as $mid )
+                        delete_metadata_by_mid( 'user', $mid );
+
                 $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
-        } else {
-                $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
-                $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id , 'meta_key' => $level_key ) );
         }