jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Revert BlockAndNuke to manifest_version_1"
......................................................................
Revert "Revert BlockAndNuke to manifest_version_1"
This reverts commit 88a7da38a81fce536ac5a21d16a2b910364c9a91.
Change-Id: I3ae1e28570b5c0dfafc8a6df45d9d02c73b80756
---
M BlockAndNuke.hooks.php
M extension.json
2 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BlockAndNuke.hooks.php b/BlockAndNuke.hooks.php
index a71f8e4..8730b3b 100644
--- a/BlockAndNuke.hooks.php
+++ b/BlockAndNuke.hooks.php
@@ -8,11 +8,4 @@
public static function onLanguageGetSpecialPageAliases(
&$specialPageAliases, $langCode ) {
$specialPageAliases['blockandnuke'] = array( 'BlockandNuke' );
}
-
- public static function onRegistration() {
- global $wgBaNwhitelist;
- if ( $wgBaNwhitelist === null ) {
- $wgBaNwhitelist = __DIR__ . '/whitelist.txt';
- }
- }
}
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 91345d8..40ef5b6 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,6 @@
"descriptionmsg": "blockandnuke-desc",
"license-name": "GPL-3.0+",
"type": "specialpage",
- "callback": "BlockAndNukeHooks::onRegistration",
"GroupPermissions": {
"sysop": {
"blockandnuke": true
@@ -35,8 +34,13 @@
"LanguageGetSpecialPageAliases":
"BlockAndNukeHooks::onLanguageGetSpecialPageAliases"
},
"config": {
- "BaNwhitelist": null,
- "BaNSpamUser": "Spammer"
+ "BaNwhitelist": {
+ "value": "whitelist.txt",
+ "path": true
+ },
+ "BaNSpamUser": {
+ "value": "Spammer"
+ }
},
- "manifest_version": 1
+ "manifest_version": 2
}
--
To view, visit https://gerrit.wikimedia.org/r/319732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ae1e28570b5c0dfafc8a6df45d9d02c73b80756
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
