jenkins-bot has submitted this change and it was merged.
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(+), 4 deletions(-)
Approvals:
Anomie: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 001509f..1221c0a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2550,11 +2550,12 @@
require_once( "$IP/extensions/Thanks/Thanks.php" );
}
-if ( $wmgUseScribunto ) {
+if ( $wmgUseCodeEditorForCore || $wmgUseScribunto || $wmgUseZeroNamespace ) {
include_once( "$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;
@@ -2659,6 +2660,7 @@
$wgExtraNamespaces[471] = 'Schema_talk';
include_once( "$IP/extensions/CodeEditor/CodeEditor.php" );
+ $wgCodeEditorEnableCore = $wmgUseCodeEditorForCore; // For
safety's sake
}
}
@@ -2792,7 +2794,6 @@
}
if ( $wmgUseZeroNamespace ) {
- include_once( "$IP/extensions/CodeEditor/CodeEditor.php" );
require_once(
"$IP/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php" );
$wgGroupPermissions['zeroadmin']['zero-edit'] = true;
$wgZeroRatedMobileAccessEnableZeroConfigPages = true;
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 5bb2d6d..8b794d1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12097,6 +12097,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: merged
Gerrit-Change-Id: I39c626d066797d887769c3715df88838e709d527
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
