jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.util: Fix replacement of $ signs in mw.util.getUrl
......................................................................
mediawiki.util: Fix replacement of $ signs in mw.util.getUrl
Bug: T149767
Change-Id: I91c1afa1f93966d1f01793d124fe8f2ae3dab0cf
---
M resources/src/mediawiki/mediawiki.util.js
M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.util.js
b/resources/src/mediawiki/mediawiki.util.js
index 866f213..654f232 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -128,7 +128,8 @@
? util.wikiScript() + '?title=' +
util.wikiUrlencode( title ) + '&' + query
: util.wikiScript() + '?' + query;
} else {
- url = mw.config.get( 'wgArticlePath' ).replace(
'$1', util.wikiUrlencode( title ) );
+ url = mw.config.get( 'wgArticlePath' )
+ .replace( '$1', util.wikiUrlencode(
title ).replace( /\$/g, '$$$$' ) );
}
// Append the encoded fragment
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index 4eac362..6dd17f1 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -136,7 +136,7 @@
} );
} );
- QUnit.test( 'getUrl', 13, function ( assert ) {
+ QUnit.test( 'getUrl', 14, function ( assert ) {
var href;
mw.config.set( {
wgScript: '/w/index.php',
@@ -150,6 +150,10 @@
href = mw.util.getUrl( 'Foo:Sandbox? 5+5=10! (test)/sub ' );
assert.equal( href,
'/wiki/Foo:Sandbox%3F_5%2B5%3D10!_(test)/sub_', 'complex title' );
+ // T149767
+ href = mw.util.getUrl( 'My$$test$$$$$title' );
+ assert.equal( href, '/wiki/My$$test$$$$$title', 'title with
multiple consecutive dollar signs' );
+
href = mw.util.getUrl();
assert.equal( href, '/wiki/Foobar', 'default title' );
--
To view, visit https://gerrit.wikimedia.org/r/319266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91c1afa1f93966d1f01793d124fe8f2ae3dab0cf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
