From e0b66dd56cb3c5056769c1d75e096ab5264a8177 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 23 Feb 2021 14:21:05 +0000
Subject: [PATCH] Users: Relocate the Password Reset feature to the Account
 Management section.

Follow-up to [50129].

Props mukesh27, audrasjb, hellofromTonya.
Fixes #52597.
Built from https://develop.svn.wordpress.org/trunk@50411


git-svn-id: http://core.svn.wordpress.org/trunk@50022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php  | 44 ++++++++++++++++++++---------------------
 wp-includes/version.php |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 1df6cdd150..ae960a5d1f 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -609,28 +609,6 @@ endif;
 	</td>
 </tr>
 <?php endif; ?>
-		<?php
-		// Allow admins to send reset password link
-		if ( ! IS_PROFILE_PAGE ) :
-			?>
-	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Password Reset' ); ?></th>
-		<td>
-			<div class="generate-reset-link">
-				<button type="button" class="button button-secondary" id="generate-reset-link">
-					<?php _e( 'Send Reset Link' ); ?>
-				</button>
-			</div>
-			<p class="description">
-				<?php
-				/* translators: %s: User's display name. */
-				printf( __( 'Send %s a link to reset their password. This will not change their password, nor will it force a change.' ), esc_html( $profileuser->display_name ) );
-				?>
-			</p>
-		</td>
-	</tr>
-		<?php endif; ?>
-
 		<?php
 		/**
 		 * Filters the display of the password fields.
@@ -692,6 +670,28 @@ endif;
 </tr>
 	<?php endif; ?>
 
+		<?php
+		// Allow admins to send reset password link.
+		if ( ! IS_PROFILE_PAGE ) :
+			?>
+	<tr class="user-sessions-wrap hide-if-no-js">
+		<th><?php _e( 'Password Reset' ); ?></th>
+		<td>
+			<div class="generate-reset-link">
+				<button type="button" class="button button-secondary" id="generate-reset-link">
+					<?php _e( 'Send Reset Link' ); ?>
+				</button>
+			</div>
+			<p class="description">
+				<?php
+				/* translators: %s: User's display name. */
+				printf( __( 'Send %s a link to reset their password. This will not change their password, nor will it force a change.' ), esc_html( $profileuser->display_name ) );
+				?>
+			</p>
+		</td>
+	</tr>
+		<?php endif; ?>
+
 		<?php
 		if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) :
 			?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 73cebffac3..6f053cfd31 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-beta3-50410';
+$wp_version = '5.7-beta3-50411';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.