From: Krinkle <krinkle@users.mediawiki.org>
Date: Tue, 5 Jul 2011 22:10:08 +0000 (+0000)
Subject: mw.util.wikiGetlink default to wgPageName
X-Git-Tag: 1.31.0-rc.0~29055
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=5a3cdf7e3d6726c47306dfade10202c88a8d41c9;p=lhc%2Fweb%2Fwiklou.git

mw.util.wikiGetlink default to wgPageName
* (bug 29723) mw.util.wikiGetlink() should default to wgPageName
* Solution by mybugs.mail

* Adding unit tests
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 7239544257..b7397ec7f0 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -66,6 +66,7 @@ production.
   show the first bit of the new redirect page.
 * (bug 5800) Added $formCallback as a parameter to the hook
   EditPage::showEditForm:initial
+* (bug 29723) mw.util.wikiGetlink() now defaults to wgPageName.
 
 === Bug fixes in 1.19 ===
 * (bug 28868) Show total pages in the subtitle of an image on the
diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index 195f2873ca..ec5393904e 100644
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -139,8 +139,8 @@
 		 * @return string Location for a page with name of 'str' or boolean false on error.
 		 */
 		'wikiGetlink' : function( str ) {
-
-			return mw.config.get( 'wgArticlePath' ).replace( '$1', this.wikiUrlencode( str ) );
+			return mw.config.get( 'wgArticlePath' ).replace( '$1',
+				this.wikiUrlencode( str || mw.config.get( 'wgPageName' ) ) );
 		},
 
 		/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
index 67fce22831..7fb8fe9db1 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
@@ -19,10 +19,11 @@ test( 'wikiUrlencode', function() {
 });
 
 test( 'wikiGetlink', function() {
-	expect(2);
+	expect(3);
 
 	// Not part of startUp module
 	mw.config.set( 'wgArticlePath', '/wiki/$1' );
+	mw.config.set( 'wgPageName', 'Foobar' );
 
 	var hrefA = mw.util.wikiGetlink( 'Sandbox' );
 	equal( hrefA, '/wiki/Sandbox', 'Simple title; Get link for "Sandbox"' );
@@ -30,6 +31,9 @@ test( 'wikiGetlink', function() {
 	var hrefB = mw.util.wikiGetlink( 'Foo:Sandbox ? 5+5=10 ! (test)/subpage' );
 	equal( hrefB, '/wiki/Foo:Sandbox_%3F_5%2B5%3D10_%21_%28test%29/subpage',
 		'Advanced title; Get link for "Foo:Sandbox ? 5+5=10 ! (test)/subpage"' );
+
+	var hrefC = mw.util.wikiGetlink();
+	equal( hrefC, '/wiki/Foobar', 'Default title; Get link for current page ("Foobar")' );
 });
 
 test( 'wikiScript', function() {