Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/292620
Change subject: Cleanup: Move never-altered UseAbuseFilter into CommonSettings ...................................................................... Cleanup: Move never-altered UseAbuseFilter into CommonSettings Change-Id: Idaf2bb5e2a9d591b9ecab46e98366e42e0f98a5b --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php M wmf-config/abusefilter.php 3 files changed, 6 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/20/292620/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index efb4df8..7bffb3f 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1758,14 +1758,13 @@ $wgCodeReviewMaxDiffPaths = 100; } -if ( $wmgUseAbuseFilter ) { - include "$IP/extensions/AbuseFilter/AbuseFilter.php"; - include( "$wmfConfigDir/abusefilter.php" ); +# abuse filter @{ +include "$IP/extensions/AbuseFilter/AbuseFilter.php"; +include( "$wmfConfigDir/abusefilter.php" ); - $wgAbuseFilterEmergencyDisableThreshold = $wmgAbuseFilterEmergencyDisableThreshold; - $wgAbuseFilterEmergencyDisableCount = $wmgAbuseFilterEmergencyDisableCount; - $wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge; -} +$wgAbuseFilterEmergencyDisableThreshold = $wmgAbuseFilterEmergencyDisableThreshold; +$wgAbuseFilterEmergencyDisableCount = $wmgAbuseFilterEmergencyDisableCount; +$wgAbuseFilterEmergencyDisableAge = $wmgAbuseFilterEmergencyDisableAge; if ( $wmgUsePdfHandler ) { include ( "$IP/extensions/PdfHandler/PdfHandler.php" ); diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9c7706f..cbe89f4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11952,10 +11952,6 @@ ], # abuse filter @{ -'wmgUseAbuseFilter' => [ - 'default' => true, -], - 'wmgAbuseFilterCentralDB' => [ 'default' => 'metawiki', ], diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index d3da3d6..9936744 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -2,7 +2,6 @@ # WARNING: This file is publically viewable on the web. Do not put private data here. # This file is for the default permissions and custom permissions of the AbuseFilter extension. -# You must also set wmgUseAbuseFilter in InitialiseSettings.php # This file is referenced from an include in CommonSettings.php $wgGroupPermissions['*']['abusefilter-view'] = true; -- To view, visit https://gerrit.wikimedia.org/r/292620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaf2bb5e2a9d591b9ecab46e98366e42e0f98a5b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits