Ticket #26195: 26195.diff

wp-admin/users.php

@@ -152 +152 @@
 
         $userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-        if ( empty( $_REQUEST['delete_option'] ) ) {
-                $url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
-                $url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) );
-                wp_redirect( $url );
-                exit;
-        }
-
         if ( ! current_user_can( 'delete_users' ) )
                 wp_die(__('You can’t delete users.'));
 
         $update = 'del';
         $delete_count = 0;
+        $delete_option = isset( $_REQUEST['delete_option'] ) ? $_REQUEST['delete_option'] : 'delete';
 
         foreach ( $userids as $id ) {
                 if ( ! current_user_can( 'delete_user', $id ) )
@@ -173 +167 @@
                         $update = 'err_admin_del';
                         continue;
                 }
-                switch ( $_REQUEST['delete_option'] ) {
+                switch ( $delete_option ) {
                 case 'delete':
                         wp_delete_user( $id );
                         break;
@@ -209 +203 @@
         else
                 $userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-        add_action( 'admin_head', 'delete_users_add_js' );
-
         include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <form action="" method="post" name="updateusers" id="updateusers">
@@ -220 +212 @@
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php _e('Delete Users'); ?></h2>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
-<div class="error">
-        <p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
-</div>
-<?php endif; ?>
 <p><?php echo _n( 'You have specified this user for deletion:', 'You have specified these users for deletion:', count( $userids ) ); ?></p>
 <ul>
 <?php
         $go_delete = 0;
+        $have_posts = false;
         foreach ( $userids as $id ) {
                 $user = get_userdata( $id );
                 if ( $id == $current_user->ID ) {
                         echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
                 } else {
                         echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+                        if ( ! $have_posts ) {
+                                $post_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_author=%d", $id ) );
+                                $have_posts = ( $post_count > 0 );
+                        }
                         $go_delete++;
                 }
         }
         ?>
         </ul>
 <?php if ( $go_delete ) : ?>
-        <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
-        <ul style="list-style:none;">
-                <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
-                <?php _e('Delete all posts.'); ?></label></li>
-                <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-                <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';
-                wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
-        </ul></fieldset>
-        <input type="hidden" name="action" value="dodelete" />
-        <?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
+        <?php if ( $have_posts ) : ?>
+                <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
+                <ul style="list-style:none;">
+                        <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
+                        <?php _e('Delete all posts.'); ?></label></li>
+                        <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
+                        <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';
+                        wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
+                </ul></fieldset>
+                <?php add_action( 'admin_head', 'delete_users_add_js' ); ?>
+        <?php endif; ?>
+                <input type="hidden" name="action" value="dodelete" />
+                <?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
 <?php else : ?>
         <p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>