Ticket #31945: 31945.diff

wp-admin/includes/user.php

@@ -440 +440 @@
         printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
         echo '</p></div>';
 }
+
+/**
+ * Gets the counts of content that will be affected by a user deletion.
+ *
+ * @param array $userids List of user ids being deleted.
+ * @param int $blogid Blog id if using multi-site
+ *
+ * @return string HTML Content
+ */
+function wp_affected_delete_user_counts( $userids = array(), $blogid = 0 ) {
+        if( is_multisite() && ! empty( $blogid ) ){
+                switch_to_blog( intval( $blogid ) );
+        }
+
+        if ( ! is_array( $userids ) ) {
+                // Puts
+                $userids = array( $userids );
+        }
+
+        if ( ! is_array( $userids ) ) {
+                print_r( $userids );
+                return false;
+        }
+
+        // Typecast all to integer.
+        $userids = array_map( 'intval', $userids );
+
+        $affected_content = '';
+        foreach( get_post_types( '', 'objects' ) as $post_type ) {
+                $affected_count = 0;
+                foreach ( $userids as $userid ) {
+                        if ( empty( $userid ) ) {
+                                continue;
+                        }
+                        $affected_count += count_user_posts( $userid, $post_type->name );
+                }
+
+                if ( isset( $post_type->labels ) && isset( $post_type->labels->name ) ) {
+                        $affected_content .= "<p>{$post_type->labels->name}: $affected_count</p>";
+                }
+        }
+
+        $output =  "<p><strong>";
+        if ( '' != $affected_content ) {
+                $output .= __( "Affected Content" );
+        } else {
+                $output .= __( "No content will be affected." );
+        }
+        $output .=  "</strong></p>";
+        $output .=  $affected_content;
+
+        if ( is_multisite() && ! empty( $blogid ) ) {
+                restore_current_blog();
+        }
+
+        return $output;
+
+}

wp-admin/network/users.php

@@ -70 +70 @@
                                                         <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
                                                 </ul>
                                                 <?php
+
+                                                echo wp_affected_delete_user_counts( $user_id, $details->userblog_id );
                                         }
+
+
                                 }
                                 echo "</fieldset>";
                         }
@@ -78 +82 @@
         }
 
         /** This action is documented in wp-admin/users.php */
-        do_action( 'delete_user_form', $current_user );
+        do_action( 'delete_user_form', $current_user, $allusers );
 
         submit_button( __('Confirm Deletion'), 'delete' );
         ?>

wp-admin/users.php

@@ -245 +245 @@
                 wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
         </ul></fieldset>
         <?php
+
+        echo wp_affected_delete_user_counts( $userids );
+
         /**
          * Fires at the end of the delete users form prior to the confirm button.
          *
          * @since 4.0.0
          *
-         * @param WP_User $current_user WP_User object for the user being deleted.
+         * @param WP_User $current_user WP_User object currently logged in user.
+         * @param array $userids List of user ids currently being deleted.
          */
-        do_action( 'delete_user_form', $current_user );
+        do_action( 'delete_user_form', $current_user, $userids );
         ?>
         <input type="hidden" name="action" value="dodelete" />
         <?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>

wp-includes/post.php

@@ -5297 +5297 @@
                 } // else none
         }
 
+        if ( 'attachment' == $post_type ) {
+                $sql .= " OR post_status = 'inherit'";
+        }
+
         $sql .= ')';
 
         return $sql;