jenkins-bot has submitted this change and it was merged.
Change subject: ve.ce.MWExtensionNode: Don't escape content of wikitext tags on
preview
......................................................................
ve.ce.MWExtensionNode: Don't escape content of wikitext tags on preview
XML-like tags in wikitext are not actually XML and don't expect their
contents to be escaped. The contents are usually not parsed as
HTML/XML anyway.
It means that it is not possible for a tag '<foo>…</foo>' to contain
the string '</foo>', but that is prevented by change Ia566452a.
Bug: 57429
Change-Id: I2516a897c85b4a3b79a34ff6cad5d124fbc30170
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 55f9587..909337d 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -54,10 +54,9 @@
mwData = this.getModel().getAttribute( 'mw' ),
extsrc = config && config.extsrc !== undefined ? config.extsrc
: mwData.body.extsrc,
attrs = config && config.attrs || mwData.attrs,
- xmlDoc = ( new DOMParser() ).parseFromString( '<' +
this.getModel().getExtensionName() + '/>', 'text/xml' ),
- wikitext = ( new XMLSerializer() ).serializeToString(
- $( xmlDoc.documentElement ).attr( attrs ).text( extsrc
)[0]
- );
+ tagName = this.getModel().getExtensionName(),
+ // XML-like tags in wikitext are not actually XML and don't
expect their contents to be escaped.
+ wikitext = mw.html.element( tagName, attrs, new mw.html.Raw(
extsrc ) );
if ( !this.constructor.static.rendersEmpty && extsrc.trim() !== '' ) {
xhr = ve.init.target.constructor.static.apiRequest( {
--
To view, visit https://gerrit.wikimedia.org/r/144158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2516a897c85b4a3b79a34ff6cad5d124fbc30170
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
