jenkins-bot has submitted this change and it was merged.
Change subject: Silence DBPerformance warnings during password migration
......................................................................
Silence DBPerformance warnings during password migration
Change-Id: I9b92d1f9a3bf2e85944d22399c0b3d27d2fcb76e
---
M includes/CentralAuthUser.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 0e61c60..0f543ae 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -1836,8 +1836,9 @@
// FIXME: this will give users "password incorrect" error.
// Giving correct message requires AuthPlugin and
SpecialUserlogin
// rewriting.
- if ( !User::idFromName( $this->getName() ) &&
$this->isOversighted() )
+ if ( !User::idFromName( $this->getName() ) &&
$this->isOversighted() ) {
return "locked";
+ }
return true;
}
@@ -1864,9 +1865,12 @@
$passwordFactory->needsUpdate(
$status->getValue() )
&&
!CentralAuthUtils::getCentralDB()->isReadOnly()
) {
+
Profiler::instance()->getTransactionProfiler()->setSilenced( true );
$this->setPassword( $password );
$this->saveSettings();
+
Profiler::instance()->getTransactionProfiler()->setSilenced( false );
}
+
return "ok";
} else {
wfDebugLog( 'CentralAuth',
--
To view, visit https://gerrit.wikimedia.org/r/309865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b92d1f9a3bf2e85944d22399c0b3d27d2fcb76e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
