jenkins-bot has submitted this change and it was merged.
Change subject: Bug54847.php: Replace removed CentralAuthUser::getPasswordHash
......................................................................
Bug54847.php: Replace removed CentralAuthUser::getPasswordHash
Needed after I642884f93673
Change-Id: I35454073a08cb46cfe37386fee491f3fdc35df69
---
M wmf-config/Bug54847.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Reedy: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
index 6b056db..4d3aea3 100644
--- a/wmf-config/Bug54847.php
+++ b/wmf-config/Bug54847.php
@@ -158,9 +158,7 @@
try {
if ( $isGlobal ) {
$centralUser = CentralAuthUser::getInstance( $user );
- list( $salt, $crypt ) = $centralUser->getPasswordHash();
- //if ( $centralUser->matchHash( $newpassword, $salt,
$crypt ) ) {
- if ( User::comparePasswords( $crypt, $newpassword,
$salt ) ) {
+ if ( $centralUser->getPasswordObject()->equals(
$newpassword ) ) {
wfDebugLog( "Bug54847", "User attempted to
reset with CentralAuth password: " . $user->getName() );
$errorMsg = 'password-recycled';
return false;
--
To view, visit https://gerrit.wikimedia.org/r/184135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35454073a08cb46cfe37386fee491f3fdc35df69
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: CSteipp <cste...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
