jenkins-bot has submitted this change and it was merged.
Change subject: Fixed crasher in wikitext escaping / link handler interaction.
......................................................................
Fixed crasher in wikitext escaping / link handler interaction.
Change-Id: Ic61688223d52016072382122835fadcab2d03b08
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index 994d902..fbe92f0 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -1033,14 +1033,14 @@
return rtData;
};
-function escapeWikiLinkContentString ( contentString, state ) {
+function escapeWikiLinkContentString ( contentString, state, contentNode ) {
// Wikitext-escape content.
//
// When processing link text, we are no longer in newline state
// since that will be preceded by "[[" or "[" text in target wikitext.
state.onSOL = false;
state.wteHandlerStack.push(state.serializer.wteHandlers.wikilinkHandler);
- var res = state.serializer.escapeWikiText(state, contentString);
+ var res = state.serializer.escapeWikiText(state, contentString, { node:
contentNode });
state.wteHandlerStack.pop();
return res;
}
@@ -1641,7 +1641,7 @@
if (!target.modified) {
linkTarget = target.value;
} else {
- linkTarget =
escapeWikiLinkContentString(linkData.content.string, state);
+ linkTarget =
escapeWikiLinkContentString(linkData.content.string, state,
linkData.contentNode);
linkTarget =
this._addColonEscape(linkTarget, linkData);
}
@@ -1667,7 +1667,7 @@
contentSrc =
linkData.content.string;
} else {
contentSrc =
escapeWikiLinkContentString(linkData.content.string || '',
- state);
+ state,
linkData.contentNode);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/72620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic61688223d52016072382122835fadcab2d03b08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
