jenkins-bot has submitted this change and it was merged.
Change subject: Use UserGetReservedNames hook instead of modifying a global at
run-time
......................................................................
Use UserGetReservedNames hook instead of modifying a global at run-time
Change-Id: I2ad98f8122f7a0b77b8f42612597fe350e5d3075
---
M Translate.php
M TranslateHooks.php
2 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.php b/Translate.php
index 76daa79..eae4258 100644
--- a/Translate.php
+++ b/Translate.php
@@ -136,6 +136,7 @@
'TranslateHooks::translateMessageDocumentationLanguage';
$GLOBALS['wgHooks']['ArticlePrepareTextForEdit'][] =
'TranslateEditAddons::disablePreSaveTransform';
$GLOBALS['wgHooks']['ParserFirstCallInit'][] =
'TranslateHooks::setupTranslateParserFunction';
+$GLOBALS['wgHooks']['UserGetReservedNames'][] =
'TranslateHooks::onUserGetReservedNames';
// Prevent translations creating bogus categories
$GLOBALS['wgHooks']['LinksUpdate'][] = 'TranslateHooks::preventCategorization';
diff --git a/TranslateHooks.php b/TranslateHooks.php
index a49d1a4..ae8b883 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -42,9 +42,6 @@
$wgAutoloadClasses['PHPlot'] = $wgTranslatePHPlot;
}
- global $wgReservedUsernames, $wgTranslateFuzzyBotName;
- $wgReservedUsernames[] = $wgTranslateFuzzyBotName;
-
// Page translation setup check and init if enabled.
global $wgEnablePageTranslation;
if ( $wgEnablePageTranslation ) {
@@ -171,6 +168,16 @@
}
/**
+ * Hook: UserGetReservedNames
+ * Prevents anyone from registering or logging in as FuzzyBot
+ * @param array $names
+ */
+ public static function onUserGetReservedNames( &$names ) {
+ global $wgTranslateFuzzyBotName;
+ $names[] = $wgTranslateFuzzyBotName;
+ }
+
+ /**
* Hook: ParserFirstCallInit
* Registers \<languages> tag with the parser.
*
--
To view, visit https://gerrit.wikimedia.org/r/197964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ad98f8122f7a0b77b8f42612597fe350e5d3075
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
