Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296679
Change subject: Don't use always true wmgUseXFFBlocks anymore
......................................................................
Don't use always true wmgUseXFFBlocks anymore
wmgUseXFFBlocks is replaced by true in CS and removed from IS.
This is a follow-up for b4d232a8, reverted by bfe052bd.
Change-Id: I3128399b273190eff4e9fd3bac9ec5454919bfb2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/79/296679/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5947b0d..262a133 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -918,7 +918,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
- $wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
+ $wgGlobalBlockingBlockXFF = true; // Apply blocks to IPs in XFF (T25343)
}
include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
@@ -3229,8 +3229,7 @@
### End (roughly) of general extensions ########################
-$wgApplyIpBlocksToXff = $wmgUseXFFBlocks;
-
+$wgApplyIpBlocksToXff = true;
// On Special:Version, link to useful release notes
$wgHooks['SpecialVersionVersionUrl'][] = function( $wgVersion, &$versionUrl ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6593d8a..1fb1ea0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16822,11 +16822,6 @@
],
### End (roughly) of general extensions ########################
-// Apply blocks to IPs in XFF (T25343)
-'wmgUseXFFBlocks' => [
- 'default' => true,
-],
-
'wgUseTidy' => [
'default' => true,
'foundationwiki' => false,
--
To view, visit https://gerrit.wikimedia.org/r/296679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3128399b273190eff4e9fd3bac9ec5454919bfb2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson <dereck...@espace-win.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
