Ticket #32796: 32796.diff

src/wp-admin/includes/ms.php

@@ -175 +175 @@
  *
  * @since 3.0.0
  *
- * @todo Merge with wp_delete_user() ?
- *
- * @global wpdb $wpdb
- *
  * @param int $id The user ID.
  * @return bool True if the user was deleted, otherwise false.
  */
 function wpmu_delete_user( $id ) {
-        global $wpdb;
-
-        $id = (int) $id;
-        $user = new WP_User( $id );
-
-        if ( !$user->exists() )
-                return false;
-        /**
-         * Fires before a user is deleted from the network.
-         *
-         * @since MU
-         *
-         * @param int $id ID of the user about to be deleted from the network.
-         */
-        do_action( 'wpmu_delete_user', $id );
-
-        $blogs = get_blogs_of_user( $id );
-
-        if ( ! empty( $blogs ) ) {
-                foreach ( $blogs as $blog ) {
-                        switch_to_blog( $blog->userblog_id );
-                        remove_user_from_blog( $id, $blog->userblog_id );
-
-                        $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-                        foreach ( (array) $post_ids as $post_id ) {
-                                wp_delete_post( $post_id );
-                        }
-
-                        // Clean links
-                        $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
-
-                        if ( $link_ids ) {
-                                foreach ( $link_ids as $link_id )
-                                        wp_delete_link( $link_id );
-                        }
-
-                        restore_current_blog();
-                }
-        }
-
-        $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 ) );
-
-        clean_user_cache( $user );
-
-        /** This action is documented in wp-admin/includes/user.php */
-        do_action( 'deleted_user', $id );
-
-        return true;
+        return wp_delete_user( $id, null, 'network' );
 }
 
 /**

src/wp-admin/includes/user.php

@@ -266 +266 @@
  *
  * @global wpdb $wpdb
  *
- * @param int $id User ID.
- * @param int $reassign Optional. Reassign posts and links to new User ID.
+ * @param int    $id       User ID.
+ * @param int    $reassign Optional. Reassign posts and links to new User ID.
+ * @param string $context  If single site, use site. If multisite, site or network.
  * @return bool True when finished.
  */
-function wp_delete_user( $id, $reassign = null ) {
+function wp_delete_user( $id, $reassign = null, $context = 'site' ) {
         global $wpdb;
 
         $id = (int) $id;
         $user = new WP_User( $id );
 
-        if ( !$user->exists() )
+        if ( ! $user->exists() ) {
                 return false;
+        }
 
         // Normalize $reassign to null or a user ID. 'novalue' was an older default.
         if ( 'novalue' === $reassign ) {
@@ -286 +288 @@
                 $reassign = (int) $reassign;
         }
 
-        /**
-         * Fires immediately before a user is deleted from the database.
-         *
-         * @since 2.0.0
-         *
-         * @param int      $id       ID of the user to delete.
-         * @param int|null $reassign ID of the user to reassign posts and links to.
-         *                           Default null, for no reassignment.
-         */
-        do_action( 'delete_user', $id, $reassign );
-
-        if ( null === $reassign ) {
-                $post_types_to_delete = array();
-                foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
-                        if ( $post_type->delete_with_user ) {
-                                $post_types_to_delete[] = $post_type->name;
-                        } elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
-                                $post_types_to_delete[] = $post_type->name;
-                        }
-                }
-
+        if ( is_multisite() && 'network' === $context ) {
                 /**
-                 * Filter the list of post types to delete with a user.
+                 * Fires before a user is deleted from the network.
                  *
-                 * @since 3.4.0
+                 * @since MU
                  *
-                 * @param array $post_types_to_delete Post types to delete.
-                 * @param int   $id                   User ID.
+                 * @param int $id ID of the user about to be deleted from the network.
                  */
-                $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
-                $post_types_to_delete = implode( "', '", $post_types_to_delete );
-                $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
-                if ( $post_ids ) {
-                        foreach ( $post_ids as $post_id )
-                                wp_delete_post( $post_id );
-                }
+                do_action( 'wpmu_delete_user', $id );
+        } else {
+                /**
+                 * Fires immediately before a user is deleted from the database.
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param int      $id       ID of the user to delete.
+                 * @param int|null $reassign ID of the user to reassign posts and links to.
+                 *                           Default null, for no reassignment.
+                 */
+                do_action( 'delete_user', $id, $reassign );
+        }
 
-                // Clean links
-                $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
+        if ( is_multisite() && 'site' === $context ) {
+                $blogs = array();
+                $blogs[0] = get_blog_details( get_current_blog_id() );
+                $blogs[0]->userblog_id = $blogs[0]->blog_id;
+        } else {
+                // Will retrieve the current site if not multisite.
+                $blogs = get_blogs_of_user( $id );
+        }
 
-                if ( $link_ids ) {
-                        foreach ( $link_ids as $link_id )
-                                wp_delete_link($link_id);
+        foreach ( $blogs as $blog ) {
+                if ( is_multisite() ) {
+                        switch_to_blog( $blog->userblog_id );
                 }
-        } else {
-                $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-                $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
-                if ( ! empty( $post_ids ) ) {
-                        foreach ( $post_ids as $post_id )
-                                clean_post_cache( $post_id );
+
+                if ( null === $reassign ) {
+                        $post_types_to_delete = array();
+                        foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
+                                if ( $post_type->delete_with_user ) {
+                                        $post_types_to_delete[] = $post_type->name;
+                                } elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+                                        $post_types_to_delete[] = $post_type->name;
+                                }
+                        }
+
+                        /**
+                         * Filter the list of post types to delete with a user.
+                         *
+                         * @since 3.4.0
+                         *
+                         * @param array $post_types_to_delete Post types to delete.
+                         * @param int   $id                   User ID.
+                         */
+                        $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
+                        $post_types_to_delete = implode( "', '", $post_types_to_delete );
+                        $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
+                        if ( $post_ids ) {
+                                foreach ( $post_ids as $post_id ) {
+                                        wp_delete_post( $post_id );
+                                }
+                        }
+
+                        // Clean links
+                        $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+
+                        if ( $link_ids ) {
+                                foreach ( $link_ids as $link_id ) {
+                                        wp_delete_link($link_id);
+                                }
+                        }
+                } else {
+                        $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
+                        $wpdb->update( $wpdb->posts, array( 'post_author' => $reassign ), array( 'post_author' => $id ) );
+                        if ( ! empty( $post_ids ) ) {
+                                foreach ( $post_ids as $post_id ) {
+                                        clean_post_cache( $post_id );
+                                }
+                        }
+                        $link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+                        $wpdb->update( $wpdb->links, array( 'link_owner' => $reassign ), array( 'link_owner' => $id ) );
+                        if ( ! empty( $link_ids ) ) {
+                                foreach ( $link_ids as $link_id ) {
+                                        clean_bookmark_cache( $link_id );
+                                }
+                        }
                 }
-                $link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
-                $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
-                if ( ! empty( $link_ids ) ) {
-                        foreach ( $link_ids as $link_id )
-                                clean_bookmark_cache( $link_id );
+
+                if ( is_multisite() ) {
+                        remove_user_from_blog( $id, $blog->userblog_id );
+                        restore_current_blog();
                 }
         }
 
         // FINALLY, delete user
-        if ( is_multisite() ) {
-                remove_user_from_blog( $id, get_current_blog_id() );
-        } else {
+        if ( ! is_multisite() || 'network' === $context ) {
                 $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-                foreach ( $meta as $mid )
+                foreach ( $meta as $mid ) {
                         delete_metadata_by_mid( 'user', $mid );
+                }
 
                 $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
         }