From: Sam Wilson <sam@samwilson.id.au>
Date: Mon, 13 Apr 2020 02:32:17 +0000 (+0800)
Subject: Clean up unused $displayPassword return value
X-Git-Tag: 1.34.2~19
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=abb5cd734581ee57ef75d4c51a35ce3260bc073c

Clean up unused $displayPassword return value

This is a follow-up to f12a3edff708a1fb73a09d154693dba49b69d921
to remove the now unused $password return variable.

Change-Id: I2b12bd7c9f84e915f1bda659a95bab3d63a611d2
---

diff --git a/includes/user/PasswordReset.php b/includes/user/PasswordReset.php
index 2958b1f2d0..25543a6caa 100644
--- a/includes/user/PasswordReset.php
+++ b/includes/user/PasswordReset.php
@@ -154,8 +154,7 @@ class PasswordReset implements LoggerAwareInterface {
 	 * @param User $performingUser The user that does the password reset
 	 * @param string|null $username The user whose password is reset
 	 * @param string|null $email Alternative way to specify the user
-	 * @return StatusValue Will contain the passwords as a username => password array if the
-	 *   $displayPassword flag was set
+	 * @return StatusValue
 	 * @throws LogicException When the user is not allowed to perform the action
 	 * @throws MWException On unexpected DB errors
 	 */
@@ -289,7 +288,6 @@ class PasswordReset implements LoggerAwareInterface {
 			return $result;
 		}
 
-		$passwords = [];
 		foreach ( $reqs as $req ) {
 			// This is adding a new temporary password, not intentionally changing anything
 			// (even though it might technically invalidate an old temporary password).
@@ -301,7 +299,7 @@ class PasswordReset implements LoggerAwareInterface {
 			$logContext
 		);
 
-		return StatusValue::newGood( $passwords );
+		return StatusValue::newGood();
 	}
 
 	/**