jenkins-bot has submitted this change and it was merged.

Change subject: If a user has a temporary password set, still take over the 
account
......................................................................


If a user has a temporary password set, still take over the account

Bug: 57439
Change-Id: I4a85b3430940f4378932ad169219cf36e88f1e6c
---
M MassMessage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/MassMessage.body.php b/MassMessage.body.php
index eca47dd..cba6529 100644
--- a/MassMessage.body.php
+++ b/MassMessage.body.php
@@ -42,7 +42,7 @@
                // Function kinda copied from the AbuseFilter
                $user = User::newFromName( $wgMassMessageAccountUsername );
                $user->load();
-               if ( $user->getId() && $user->mPassword == '' ) {
+               if ( $user->getId() && $user->mPassword == '' && 
$user->mNewpassword == '' ) {
                        // We've already stolen the account
                        return $user;
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/97117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a85b3430940f4378932ad169219cf36e88f1e6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: MZMcBride <w...@mzmcbride.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

Reply via email to