jenkins-bot has submitted this change and it was merged. Change subject: Workaround for T136644 ......................................................................
Workaround for T136644 Converting AbuseFilter to extension registration caused config lines like $x = array_diff($x, ...) to break as they run before the extension globals are registered. As a quick hack, copy the relevant variable; will be fixed later by changing it into an associative array. Bug: T136644 Change-Id: I6332d84ecdc72ae8cabb787f4a10e6b59e7e4c2a --- M wmf-config/abusefilter.php 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved Paladox: Looks good to me, but someone else must approve Legoktm: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index d3da3d6..bdf1a23 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -5,6 +5,19 @@ # You must also set wmgUseAbuseFilter in InitialiseSettings.php # This file is referenced from an include in CommonSettings.php +# FIXME temporarily duplicated from extension.json to prevent T136644 +$wgAbuseFilterAvailableActions = array( + 'flag', + 'throttle', + 'warn', + 'disallow', + 'blockautopromote', + 'block', + 'degroup', + 'tag', +); + + $wgGroupPermissions['*']['abusefilter-view'] = true; $wgGroupPermissions['*']['abusefilter-log'] = true; -- To view, visit https://gerrit.wikimedia.org/r/292036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6332d84ecdc72ae8cabb787f4a10e6b59e7e4c2a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
