Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/239124
Change subject: Use new User::newSystemUser() when available
......................................................................
Use new User::newSystemUser() when available
See core change I2c736ad72d946fa9b859e6cd335fa58aececc0d5.
Also remove a call to User::getPassword(), since that's going away.
Change-Id: I4424c2cf2088dd02fa8eb3ff5abc2fac1ddf7414
---
M includes/MassMessage.php
M tests/MassMessageTest.php
2 files changed, 25 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/24/239124/1
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index d844f1f..49f4d41 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -39,28 +39,33 @@
*/
public static function getMessengerUser() {
global $wgMassMessageAccountUsername;
- // Function kinda copied from the AbuseFilter
- $user = User::newFromName( $wgMassMessageAccountUsername );
- if ( $user->getId() && $user->getPassword() instanceof
InvalidPassword
- && $user->getTemporaryPassword() instanceof
InvalidPassword
- ) {
- // We've already stolen the account
- return $user;
- }
-
- if ( !$user->getId() ) {
- $user->addToDatabase();
- $user->saveSettings();
-
- // Increment site_stats.ss_users
- $ssu = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
- $ssu->doUpdate();
+ if ( method_exists( 'User', 'newSystemUser' ) ) {
+ $user = User::newSystemUser(
$wgMassMessageAccountUsername, array( 'steal' => true ) );
} else {
- // Someone already created the account, lets take it
over.
- $user->setPassword( null );
- $user->setEmail( null );
- $user->saveSettings();
+ // Function kinda copied from the AbuseFilter
+ $user = User::newFromName(
$wgMassMessageAccountUsername );
+
+ if ( $user->getId() && $user->getPassword() instanceof
InvalidPassword
+ && $user->getTemporaryPassword() instanceof
InvalidPassword
+ ) {
+ // We've already stolen the account
+ return $user;
+ }
+
+ if ( !$user->getId() ) {
+ $user->addToDatabase();
+ $user->saveSettings();
+
+ // Increment site_stats.ss_users
+ $ssu = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
+ $ssu->doUpdate();
+ } else {
+ // Someone already created the account, lets
take it over.
+ $user->setPassword( null );
+ $user->setEmail( null );
+ $user->saveSettings();
+ }
}
// Make the user a bot so it doesn't look weird
diff --git a/tests/MassMessageTest.php b/tests/MassMessageTest.php
index d65154d..7c48fe2 100644
--- a/tests/MassMessageTest.php
+++ b/tests/MassMessageTest.php
@@ -70,7 +70,6 @@
$user = MassMessage::getMessengerUser();
$this->assertEquals( $name, $user->getName() );
$this->assertTrue( in_array( 'bot', $user->getGroups() ) );
- $this->assertInstanceOf( 'InvalidPassword',
$user->getPassword() );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/239124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4424c2cf2088dd02fa8eb3ff5abc2fac1ddf7414
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
