jenkins-bot has submitted this change and it was merged.
Change subject: Fix rt test crasher when decoding invalid URIs
......................................................................
Fix rt test crasher when decoding invalid URIs
Fixes a crasher on it:...Little_Broken_Hearts.
Change-Id: Ia5baa357c81abb5bdc0ede3b49151e65ed1624f3
---
M js/lib/mediawiki.Util.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 0e4fe18..15fc05d 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -1053,7 +1053,7 @@
replace(/<span><\/span>/g, '').
replace(/(href=")(?:\.?\.\/)+/g, '$1').
// replace unnecessary URL escaping
- replace(/ href="[^"]*"/g, decodeURIComponent).
+ replace(/ href="[^"]*"/g, Util.decodeURI).
// strip thumbnail size prefixes
replace(/(src="[^"]*?)\/thumb(\/[0-9a-f]\/[0-9a-f]{2}\/[^\/]+)\/[0-9]+px-[^"\/]+(?=")/g,
'$1$2').
replace(/(<(table|tbody|tr|th|td|\/th|\/td)[^<>]*>)\s+/g, '$1');
@@ -1095,7 +1095,7 @@
// parsoid always add a page name to lonely fragments
.replace(/href="#/g, 'href="Main Page#')
// replace unnecessary URL escaping
- .replace(/ href="[^"]*"/g, decodeURIComponent)
+ .replace(/ href="[^"]*"/g, Util.decodeURI)
// strip empty spans
.replace(/<span><\/span>/g, '')
.replace(/(<(table|tbody|tr|th|td|\/th|\/td)[^<>]*>)\s+/g, '$1');
--
To view, visit https://gerrit.wikimedia.org/r/72622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5baa357c81abb5bdc0ede3b49151e65ed1624f3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
