X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_user_edit%27%2C%20iduser=user.userid%29%20%7D%7D?a=blobdiff_plain;f=maintenance%2FchangePassword.php;h=aa45154dddd43cacfa4fb077cb356047a21883cd;hb=1eb5d8e44d7f0476a3f85b3f7e15d7f2cbc51f9e;hp=316004bdf0654b530494c4fe3e176d3525c7d44c;hpb=577f3d79115173f4dd16bb46f6d0ef2c82b55add;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php
index 316004bdf0..aa45154ddd 100644
--- a/maintenance/changePassword.php
+++ b/maintenance/changePassword.php
@@ -52,19 +52,15 @@ class ChangePassword extends Maintenance {
 			$this->fatalError( "No such user: " . $this->getOption( 'user' ) );
 		}
 		$password = $this->getOption( 'password' );
-		try {
-			$status = $user->changeAuthenticationData( [
-				'username' => $user->getName(),
-				'password' => $password,
-				'retype' => $password,
-			] );
-			if ( !$status->isGood() ) {
-				throw new PasswordError( $status->getWikiText( null, null, 'en' ) );
-			}
-			$user->saveSettings();
+		$status = $user->changeAuthenticationData( [
+			'username' => $user->getName(),
+			'password' => $password,
+			'retype' => $password,
+		] );
+		if ( $status->isGood() ) {
 			$this->output( "Password set for " . $user->getName() . "\n" );
-		} catch ( PasswordError $pwe ) {
-			$this->fatalError( $pwe->getText() );
+		} else {
+			$this->fatalError( $status->getMessage( false, false, 'en' )->text() );
 		}
 	}
 }