jenkins-bot has submitted this change and it was merged.
Change subject: Fix PHP Notice: Undefined index visualeditor-enable-language
......................................................................
Fix PHP Notice: Undefined index visualeditor-enable-language
Follows-up I14560b758c6.
Change-Id: I3e4d821fb52fd6fd9ffc0529741218005a33702f
---
M VisualEditor.php
1 file changed, 9 insertions(+), 5 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 520951e..c641ecb 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -69,11 +69,6 @@
$wgHooks['PageContentSaveComplete'][] =
'VisualEditorHooks::onPageContentSaveComplete';
$wgExtensionFunctions[] = 'VisualEditorHooks::onSetup';
-// Set default values for new preferences
-$wgDefaultUserOptions['visualeditor-enable'] = 0;
-$wgDefaultUserOptions['visualeditor-enable-experimental'] = 0;
-$wgDefaultUserOptions['visualeditor-betatempdisable'] = 0;
-
// Register resource modules
$wgVisualEditorResourceTemplate = array(
@@ -1181,6 +1176,14 @@
),
);
+/* Extend MediaWiki configuration */
+
+// Set default values for new preferences
+$wgDefaultUserOptions['visualeditor-enable'] = 0;
+$wgDefaultUserOptions['visualeditor-betatempdisable'] = 0;
+$wgDefaultUserOptions['visualeditor-enable-experimental'] = 0;
+$wgDefaultUserOptions['visualeditor-enable-language'] = 0;
+
/* Configuration */
@@ -1190,6 +1193,7 @@
// Array of modules to load based on a preference. Keys are preference names,
values are
// ResourceLoader module names.
+// Remember to also set defaults in $wgDefaultUserOptions!
$wgVisualEditorPreferenceModules = array(
'visualeditor-enable-experimental' => 'ext.visualEditor.experimental',
'visualeditor-enable-language' => 'ext.visualEditor.language',
--
To view, visit https://gerrit.wikimedia.org/r/130496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e4d821fb52fd6fd9ffc0529741218005a33702f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
