Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62814
Change subject: Make $wgCodeEditorEnableCore configurable per wiki
......................................................................
Make $wgCodeEditorEnableCore configurable per wiki
In preparation for enabling it for editing JS and CSS. The current plan
is to enable it in Beta Labs for testing as soon as bug 47235 is fixed,
and ideally to start turning it on for live sites next week.
Bug: 39653
Change-Id: I39c626d066797d887769c3715df88838e709d527
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/14/62814/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7b360ff..24c6503 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2547,11 +2547,12 @@
require_once( "$IP/extensions/Thanks/Thanks.php" );
}
-if ( $wmgUseScribunto ) {
+if ( $wmgUseCodeEditorForCore || $wmgUseScribunto ) {
include( "$IP/extensions/CodeEditor/CodeEditor.php" );
- // Don't enable core functionality until it has been reviewed and
approved
- $wgCodeEditorEnableCore = false;
+ $wgCodeEditorEnableCore = $wmgUseCodeEditorForCore;
+}
+if ( $wmgUseScribunto ) {
include( "$IP/extensions/Scribunto/Scribunto.php" );
$wgScribuntoUseGeSHi = true;
$wgScribuntoUseCodeEditor = true;
@@ -2656,6 +2657,7 @@
$wgExtraNamespaces[471] = 'Schema_talk';
include_once( "$IP/extensions/CodeEditor/CodeEditor.php" );
+ $wgCodeEditorEnableCore = $wmgUseCodeEditorForCore; // For
safety's sake
}
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 0f79be0..4743428 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -255,6 +255,12 @@
'labswiki' => 'personal',
),
+ // (bug 39653) The plan is to enable it for testing on labs first, so
add
+ // the config hook to be able to do that.
+ 'wmgUseCodeEditorForCore' => array(
+ 'default' => false,
+ ),
+
);
} # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index c9ac96b..2495bff 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12100,6 +12100,10 @@
'mediawikiwiki' => true,
),
+'wmgUseCodeEditorForCore' => array(
+ 'default' => false,
+),
+
'wmgUseScribunto' => array(
'default' => true,
),
--
To view, visit https://gerrit.wikimedia.org/r/62814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39c626d066797d887769c3715df88838e709d527
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
