Ticket #19500: 19500.diff

wp-includes/user.php

@@ -716 +716 @@
                 }
         }
 
+        if ( ! $blogs ) // No blogs means false.
+                $blogs = false;
+
         return apply_filters( 'get_blogs_of_user', $blogs, $user_id, $all );
 }
 

wp-admin/includes/user.php

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