jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374653 )
Change subject: Move a variable closer to other relevant code
......................................................................
Move a variable closer to other relevant code
Change-Id: Idc5cd800546386b5d9530915aba3c6e8a56f20ca
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5780cb8..52675fb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1923,6 +1923,10 @@
# AbuseFilter
wfLoadExtension( 'AbuseFilter' );
include "$wmfConfigDir/abusefilter.php";
+if ( $wmgUseGlobalAbuseFilters ) {
+ $wgAbuseFilterCentralDB = $wmgAbuseFilterCentralDB;
+ $wgAbuseFilterIsCentral = ( $wgDBname === $wgAbuseFilterCentralDB );
+}
if ( $wmgUsePdfHandler ) {
wfLoadExtension( 'PdfHandler' );
@@ -3189,11 +3193,6 @@
if ( $wmgUseSearchExtraNS ) {
wfLoadExtension( 'SearchExtraNS' );
$wgSearchExtraNamespaces = $wmgSearchExtraNamespaces;
-}
-
-if ( $wmgUseGlobalAbuseFilters ) {
- $wgAbuseFilterCentralDB = $wmgAbuseFilterCentralDB;
- $wgAbuseFilterIsCentral = ( $wgDBname === $wgAbuseFilterCentralDB );
}
if ( $wmgZeroPortal || $wmgUseGraph || $wmgZeroBanner ) {
--
To view, visit https://gerrit.wikimedia.org/r/374653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc5cd800546386b5d9530915aba3c6e8a56f20ca
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Urbanecm <martin.urba...@wikimedia.cz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
