Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/262999

Change subject: Prepare for merged of ApiSandbox into core
......................................................................

Prepare for merged of ApiSandbox into core

We need to load the extension for branches without Ic42a6c5, but we must
not include it once that patch is merged.

Change-Id: Ic85ff4abbbcd2076ebf5cdfaa0e95e98878e2308
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/99/262999/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3331faa..b08fff8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2388,7 +2388,9 @@
 
 }
 
-if ( $wmgUseApiSandbox ) {
+// Keep loading the extension for MW before Ic42a6c5, but don't load it in
+// branches where that is merged.
+if ( $wmgUseApiSandbox && !class_exists( 'SpecialApiSandbox' ) ) {
        wfLoadExtension( 'ApiSandbox' );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic85ff4abbbcd2076ebf5cdfaa0e95e98878e2308
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to