wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Disable ArticleTargetLoader on invalid UTF-8 URIs"

Browse source
This commit is contained in:
jenkins-bot 2020-09-09 12:17:55 +00:00 committed by Gerrit Code Review
parent 2afe857c82 0d64cd8649
commit 4e55aa9488
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/ve-mw/preinit/ve.init.mw.ArticleTargetLoader.js
View file

@ -19,7 +19,7 @@
*/
( function () {
var prefName, prefValue,
uri = new mw.Uri(),
uri, editintro,
namespaces = mw.config.get( 'wgNamespaceIds' ),
conf = mw.config.get( 'wgVisualEditorConfig' ),
pluginCallbacks = [],
@ -27,8 +27,16 @@
// Add modules from $wgVisualEditorPluginModules
.concat( conf.pluginModules.filter( mw.loader.getState ) );
try {
uri = new mw.Uri();
editintro = uri.query.editintro;
} catch ( e ) {
// URI may not be parseable (T106244)
uri = false;
}
// Provide the new wikitext editor
if (
uri &&
conf.enableWikitext &&
(
mw.user.options.get( 'visualeditor-newwikitext' ) ||
@ -287,7 +295,7 @@
page: pageName,
badetag: options.badetag,
uselang: mw.config.get( 'wgUserLanguage' ),
editintro: uri.query.editintro,
editintro: editintro,
preload: options.preload,
preloadparams: options.preloadparams,
formatversion: 2
@ -484,7 +492,7 @@
paction: 'wikitext',
page: pageName,
uselang: mw.config.get( 'wgUserLanguage' ),
editintro: uri.query.editintro,
editintro: editintro,
preload: options.preload,
preloadparams: options.preloadparams,
formatversion: 2