Users: Show "Password reset link sent" message only when finished.

hellofromtonya · hellofromtonya · commit 39e28173d5c2 · 2023-10-15T14:02:34.000Z
When an admin sends a password reset link to a user (from the Users UI screen), the "finished" UI message: >Password reset link sent. is displayed on "finished" and no longer displayed on error. **What is the change?** Previously, the conditional (for incrementing the reset counter) checked for a truthy return from `retrieve_password()`. But `retrieve_password()` always returns a truthy state: `true` (meaning "finished") or an instance of `WP_Error`. Thus, checking for a truthy meant the "finished" message was sent on both "finished" and error/failed. This fix checks for `retrieve_password()` returning `true` to indicate "finished". **What is displayed on error?** If `retrieve_password()` returns an instance of `WP_Error`, the following UI message is shown: >Password reset links sent to 0 users. The UI messages were not modified by this changeset. Follow-up to [50129]. Props letraceursnork, prashantbhivsane, audrasjb, costdev, dilipbheda, hareesh-pillai, hellofromTonya, ironprogrammer, huzaifaalmesbah, marybaum, nicolefurlan, oglekler, petitphp, SergeyBiryukov. Fixes #58407. git-svn-id: https://develop.svn.wordpress.org/trunk@56937 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
@@ -256,7 +256,7 @@
 
 			// Send the password reset link.
 			$user = get_userdata( $id );
-			if ( retrieve_password( $user->user_login ) ) {
+			if ( true === retrieve_password( $user->user_login ) ) {
 				++$reset_count;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@`
`256`	`256`
`257`	`257`	`// Send the password reset link.`
`258`	`258`	`$user = get_userdata( $id );`
`259`		`- if ( retrieve_password( $user->user_login ) ) {`
	`259`	`+ if ( true === retrieve_password( $user->user_login ) ) {`
`260`	`260`	`++$reset_count;`
`261`	`261`	`}`
`262`	`262`	`}`