jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/355078 )
Change subject: VisualEditor: Fix for wrong regex match ...................................................................... VisualEditor: Fix for wrong regex match VisualEditor matches behaviuor switches, but this regex also matches 2 links containg double underscore in the same line, like: [https://google.com/stg__ Google][https://google.com/stg__ Google2] Changed this regex to match only non-white space chars, preventing it to match link tags ERM: #6402 Needs cherry-picking to REL1_27 and REL1_23 Change-Id: I3803e88b878e080102cece4da6c54d631e5e9844 --- M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js index 9c288d7..f429b16 100644 --- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js +++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js @@ -1705,7 +1705,7 @@ } mtext = text; - regex = "__(.*?)__"; + regex = "__(\S*?)__"; matcher = new RegExp(regex, 'gmi'); i = 0; swt = ''; -- To view, visit https://gerrit.wikimedia.org/r/355078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3803e88b878e080102cece4da6c54d631e5e9844 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Mglaser <[email protected]> Gerrit-Reviewer: ItSpiderman <[email protected]> Gerrit-Reviewer: Mglaser <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
