Ticket #15855: 15855.patch

wp-admin/users.php

@@ -118 +118 @@
                         break;
                 case 'reassign':
                         if ( current_user_can('delete_user', $id) )
-                                wp_delete_user($id, $_REQUEST['reassign_user']);
+                                wp_delete_user($id, $_REQUEST['user']);
                         break;
                 }
                 ++$delete_count;
@@ -218 +218 @@
                         $update = 'err_admin_remove';
                         continue;
                 }
-                remove_user_from_blog($id, $blog_id);
+                switch ( $_REQUEST['delete_option'] ) {
+                case 'delete':
+                        remove_user_from_blog( $id, $blog_id );
+                        break;
+                case 'reassign':
+                        remove_user_from_blog( $id, $blog_id, $_REQUEST['user'] );
+                        break;
+                }
         }
 
         $redirect = add_query_arg( array('update' => $update), $redirect);
@@ -271 +278 @@
         }
         ?>
 <?php if ( $go_remove ) : ?>
-                <input type="hidden" name="action" value="doremove" />
-                <?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
+        <fieldset><p><legend><?php _e('What should be done with posts and links owned by this user?'); ?></legend></p>
+        <ul style="list-style:none;">
+                <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
+                <?php _e('Delete all posts and links.'); ?></label></li>
+                <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
+                <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:').'</label>';
+                wp_dropdown_users( array( 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
+        </ul></fieldset>
+        <input type="hidden" name="action" value="doremove" />
+        <?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
 <?php else : ?>
         <p><?php _e('There are no valid users selected for removal.'); ?></p>
 <?php endif; ?>