From 54ab5fa68ced0a2a6a1aab588e7c7c18b80cf212 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Tue, 23 Feb 2016 17:42:27 +0000
Subject: [PATCH] Users: Pass the array of user IDs being deleted to the
 `delete_user_form` action hook in two places.

Also updates documentation for the first parameter, `$current_user`, to clarify that it holds the `WP_User` object for the _current_ user, not the one being deleted.

Props usermrpapa.
Fixes #35063.

Built from https://develop.svn.wordpress.org/trunk@36640


git-svn-id: http://core.svn.wordpress.org/trunk@36607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php | 2 +-
 wp-admin/users.php       | 6 ++++--
 wp-includes/version.php  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 2583f9d157..5f9ba58024 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -1088,7 +1088,7 @@ function confirm_delete_users( $users ) {
 	</table>
 	<?php
 	/** This action is documented in wp-admin/users.php */
-	do_action( 'delete_user_form', $current_user );
+	do_action( 'delete_user_form', $current_user, $allusers );
 
 	if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index d13c43b278..b25bcc7680 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -284,10 +284,12 @@ case 'delete':
 	 * Fires at the end of the delete users form prior to the confirm button.
 	 *
 	 * @since 4.0.0
+	 * @since 4.5.0 The `$userids` parameter was added.
 	 *
-	 * @param WP_User $current_user WP_User object for the user being deleted.
+	 * @param WP_User $current_user WP_User object for the current user.
+	 * @param array   $userids      Array of IDs for users 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'), 'primary' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 60385ba485..886fcb2e71 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36639';
+$wp_version = '4.5-alpha-36640';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.