jenkins-bot has submitted this change and it was merged.
Change subject: Remove pre-User::newSystemUser back-compat
......................................................................
Remove pre-User::newSystemUser back-compat
Change-Id: Ic396917ba5600fc120d6a688a14e437d9ad42840
---
M extension.json
M includes/MassMessage.php
2 files changed, 4 insertions(+), 29 deletions(-)
Approvals:
Wctaiwan: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 36dcacb..1b4456f 100644
--- a/extension.json
+++ b/extension.json
@@ -21,7 +21,7 @@
"MassMessageWikiAliases": {}
},
"requires": {
- "MediaWiki": ">= 1.26.0"
+ "MediaWiki": ">= 1.27.0"
},
"TrackingCategories": [
"massmessage-list-category"
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 49f4d41..11f4869 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -40,34 +40,9 @@
public static function getMessengerUser() {
global $wgMassMessageAccountUsername;
- if ( method_exists( 'User', 'newSystemUser' ) ) {
- $user = User::newSystemUser(
$wgMassMessageAccountUsername, array( 'steal' => true ) );
- } else {
- // 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();
- }
- }
-
+ $user = User::newSystemUser(
+ $wgMassMessageAccountUsername, array( 'steal' => true )
+ );
// Make the user a bot so it doesn't look weird
$user->addGroup( 'bot' );
--
To view, visit https://gerrit.wikimedia.org/r/265463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic396917ba5600fc120d6a688a14e437d9ad42840
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Wctaiwan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
