X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fauth%2FLocalPasswordPrimaryAuthenticationProvider.php;h=fd36887c0620aee1abe322366720b3fda8abc22d;hb=ce079cf6ad79ca8d3360817f809b219d166f9153;hp=1013990a03b7a816bfcde4a586a77e0bed0fe3bf;hpb=6dbe9b23972d671c933746406de39ad95544142c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
index 1013990a03..fd36887c06 100644
--- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
@@ -104,7 +104,7 @@ class LocalPasswordPrimaryAuthenticationProvider
 		// The old hash format was just an md5 hex hash, with no type information
 		if ( preg_match( '/^[0-9a-f]{32}$/', $row->user_password ) ) {
 			if ( $this->config->get( 'PasswordSalt' ) ) {
-				$row->user_password = ":A:{$row->user_id}:{$row->user_password}";
+				$row->user_password = ":B:{$row->user_id}:{$row->user_password}";
 			} else {
 				$row->user_password = ":A:{$row->user_password}";
 			}
@@ -132,12 +132,12 @@ class LocalPasswordPrimaryAuthenticationProvider
 
 		// @codeCoverageIgnoreStart
 		if ( $this->getPasswordFactory()->needsUpdate( $pwhash ) ) {
-			$pwhash = $this->getPasswordFactory()->newFromPlaintext( $req->password );
-			\DeferredUpdates::addCallableUpdate( function () use ( $pwhash, $oldRow ) {
+			$newHash = $this->getPasswordFactory()->newFromPlaintext( $req->password );
+			\DeferredUpdates::addCallableUpdate( function () use ( $newHash, $oldRow ) {
 				$dbw = wfGetDB( DB_MASTER );
 				$dbw->update(
 					'user',
-					[ 'user_password' => $pwhash->toString() ],
+					[ 'user_password' => $newHash->toString() ],
 					[
 						'user_id' => $oldRow->user_id,
 						'user_password' => $oldRow->user_password