jenkins-bot has submitted this change and it was merged.

Change subject: Only require_once JsonConfig.php in one place
......................................................................


Only require_once JsonConfig.php in one place

Change-Id: I5207886db3a9efd0f5ae79611bc7d39e745f56c2
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c2c2ad9..b7287bc 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3001,8 +3001,11 @@
        $wgAbuseFilterIsCentral = ( $wgDBname == $wgAbuseFilterCentralDB );
 }
 
-if ( $wmgZeroPortal ) {
+if ( $wmgZeroPortal || $wmgUseGraph ) {
        require_once( "$IP/extensions/JsonConfig/JsonConfig.php" );
+}
+
+if ( $wmgZeroPortal ) {
        require_once( "$IP/extensions/ZeroBanner/ZeroBanner.php" );
        require_once( "$IP/extensions/ZeroPortal/ZeroPortal.php" );
 
@@ -3052,7 +3055,6 @@
 }
 
 if ( $wmgUseGraph ) {
-       require_once( "$IP/extensions/JsonConfig/JsonConfig.php" );
        wfLoadExtension( 'Graph' );
 
        // **** THIS LIST MUST MATCH puppet/hieradata/role/common/scb.yaml ****

-- 
To view, visit https://gerrit.wikimedia.org/r/304617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5207886db3a9efd0f5ae79611bc7d39e745f56c2
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to