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 7239544..b7397ec 100644 (file)
--- 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 195f287..ec53939 100644 (file)
--- 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 67fce22..7fb8fe9 100644 (file)
--- 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() {