Wctaiwan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154449
Change subject: Fix MassMessage::getMessengerUser() after Password API changes
......................................................................
Fix MassMessage::getMessengerUser() after Password API changes
Bug: 68843
Change-Id: I840c98dca02efc047c0657647f434d921ae73e45
---
M includes/MassMessage.php
M tests/MassMessageTest.php
2 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/49/154449/1
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 59e8afc..926d8f7 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -41,8 +41,10 @@
global $wgMassMessageAccountUsername;
// Function kinda copied from the AbuseFilter
$user = User::newFromName( $wgMassMessageAccountUsername );
- $user->load();
- if ( $user->getId() && $user->mPassword == '' &&
$user->mNewpassword == '' ) {
+
+ if ( $user->getId() && $user->getPassword() instanceof
InvalidPassword
+ && $user->getTemporaryPassword() instanceof
InvalidPassword
+ ) {
// We've already stolen the account
return $user;
}
diff --git a/tests/MassMessageTest.php b/tests/MassMessageTest.php
index c70ebfa..3977fc4 100644
--- a/tests/MassMessageTest.php
+++ b/tests/MassMessageTest.php
@@ -78,14 +78,11 @@
* @param $name
*/
public function testGetMessengerUser( $name ) {
- global $wgMassMessageAccountUsername;
- $wgMassMessageAccountUsername = $name;
+ $this->setMwGlobals( 'wgMassMessageAccountUsername', $name );
$user = MassMessage::getMessengerUser();
$this->assertEquals( $user->getName(), $name );
$this->assertTrue( in_array( 'bot' , $user->getGroups() ) );
- // FIXME: temporarily disabled to not block ongoing
- // development, see bug 68843
- //$this->assertEquals( $user->mPassword, '' );
+ $this->assertInstanceOf( 'InvalidPassword',
$user->getPassword() );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/154449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I840c98dca02efc047c0657647f434d921ae73e45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
