Catrope has uploaded a new change for review.

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


Change subject: Disable VisualEditor in content namespaces on svwiktionary
......................................................................

Disable VisualEditor in content namespaces on svwiktionary

We tried to only enable it in the User namespace, but the way the config
was rigged up, the main namespace was added because it's a content namespace.

Adding a flag to disable adding content namespaces, and only setting it
for svwiktionary.

Change-Id: Ie190a5853d5e17760cb6616dbaf9f3b2da4fa182
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e89e8b6..bc72947 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1861,7 +1861,11 @@
        $wgVisualEditorParsoidURL = 'http://10.2.2.29'; // 
parsoidcache.svc.eqiad.wmnet
        $wgVisualEditorParsoidPrefix = $wgDBname;
        $wgVisualEditorParsoidProblemReportURL = 
'http://parsoid.wmflabs.org/_bugs/';
-       $wgVisualEditorNamespaces = array_merge( $wgVisualEditorNamespaces, 
$wmgVisualEditorNamespaces );
+       if ( $wmgVisualEditorInContentNamespaces ) {
+               $wgVisualEditorNamespaces = array_merge( 
$wgVisualEditorNamespaces, $wmgVisualEditorNamespaces );
+       } else {
+               $wgVisualEditorNamespaces = $wmgVisualEditorNamespaces;
+       }
 
        // VisualEditor namespace
        // This used to be in the VisualEditor extension but was removed there
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cc22d72..e156c47 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10597,6 +10597,12 @@
        'svwiktionary' => array( NS_USER ), // Bug 57356
 ),
 
+// Whether to add $wgContentNamespaces to $wmgVisualEditorNamespaces above
+'wmgVisualEditorInContentNamespaces' => array(
+       'default' => true,
+       'svwiktionary' => false,
+),
+
 // Should a namespace in which VisualEditor is enabled by default for all 
users (including anons)
 'wmgUseVisualEditorNamespace' => array(
        'default' => false,

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

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

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

Reply via email to