Changeset 36106

Timestamp:

12/27/2015 02:16:40 AM (9 years ago)

Author:

dd32

Message:

Users: When determining whether to show the reassign content option during user delete, don't rely upon WP_Query as it doesn't return all forms of content wp_delete_user() operates on.

This restores the reassign form when a user has a non-public post type or links assigned to them.

Merges [36068] to the 4.4 branch.
Props swissspidy & tharsheblows for initial patches.
Fixes #34993.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-admin/users.php (modified) (2 diffs)

branches/4.4/src/wp-admin/users.php

@@ -212 +212 @@
         $userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-    $users_posts = new WP_Query( array(
-        'post_type' => 'any',
-        'author' => implode( ',', $userids ),
-        'posts_per_page' => 1
-    ) );
-
-    if ( $users_posts->have_posts() ) {
+    $users_have_content = false;
+    if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) {
+        $users_have_content = true;
+    } elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) {
+        $users_have_content = true;
+    }
+
+    if ( $users_have_content ) {
         add_action( 'admin_head', 'delete_users_add_js' );
     }
@@ -258 +259 @@
 <?php if ( $go_delete ) :
 
-    if ( ! $users_posts->have_posts() ) : ?>
+    if ( ! $users_have_content ) : ?>
         <input type="hidden" name="delete_option" value="delete" />
     <?php else: ?>