* (bug 13247) Prettified ISBN links

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b1b33d7..7aa01ce 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -63,6 +63,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   maintenance/cleanupSpam.php
 * All skins should have the "mediawiki" class on the body element
 * (bug 13019) Message cache for some extensions not loaded at time of editing
+* (bug 13247) Prettified ISBN links
 
 === API changes in 1.13 ===
 

diff --git a/includes/Parser.php b/includes/Parser.php
index e21ee65..fde3351 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1005,9 +1005,9 @@ class Parser
                                ' ' => '',
                                'x' => 'X',
                        ));
-                       $titleObj = SpecialPage::getTitleFor( 'Booksources' );
+                       $titleObj = SpecialPage::getTitleFor( 'Booksources', $num );
                        $text = '<a href="' .
-                               $titleObj->escapeLocalUrl( "isbn=$num" ) .
+                               $titleObj->escapeLocalUrl() .
                                "\" class=\"internal\">ISBN $isbn</a>";
                } else {
                        if ( substr( $m[0], 0, 3 ) == 'RFC' ) {

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 62cddc4..8e063ce 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -2102,7 +2102,7 @@ Magic links: ISBN (bug 1937)
 !! input
 ISBN 0-306-40615-2
 !! result
-<p><a href="/index.php?title=Special:Booksources&amp;isbn=0306406152" class="internal">ISBN 0-306-40615-2</a>
+<p><a href="/wiki/Special:Booksources/0306406152" class="internal">ISBN 0-306-40615-2</a>
 </p>
 !! end
 
@@ -3108,7 +3108,7 @@ BUG 1887: A ISBN with a thumbnail
 !! input
 [[Image:foobar.jpg|thumb|ISBN 1235467890]]
 !! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="ISBN 1235467890" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="/index.php?title=Special:Booksources&amp;isbn=1235467890" class="internal">ISBN 1235467890</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/Image:Foobar.jpg" class="image" title="ISBN 1235467890"><img alt="ISBN 1235467890" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" border="0" class="thumbimage" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="" /></a></div><a href="/wiki/Special:Booksources/1235467890" class="internal">ISBN 1235467890</a></div></div></div>
 
 !! end
 
@@ -6014,7 +6014,7 @@ ISBN code coverage
 !! input
 ISBN  978-0-1234-56&#x20;789
 !! result
-<p><a href="/index.php?title=Special:Booksources&amp;isbn=9780123456" class="internal">ISBN 978-0-1234-56</a>&#x20;789
+<p><a href="/wiki/Special:Booksources/9780123456" class="internal">ISBN 978-0-1234-56</a>&#x20;789
 </p>
 !! end
 
@@ -6032,7 +6032,7 @@ Double ISBN
 !! input
 ISBN ISBN 1234567890
 !! result
-<p>ISBN <a href="/index.php?title=Special:Booksources&amp;isbn=1234567890" class="internal">ISBN 1234567890</a>
+<p>ISBN <a href="/wiki/Special:Booksources/1234567890" class="internal">ISBN 1234567890</a>
 </p>
 !! end
 
@@ -6341,7 +6341,7 @@ ISBN with space-delimited number
 !! input
 ISBN 92 9017 032 8
 !! result
-<p><a href="/index.php?title=Special:Booksources&amp;isbn=9290170328" class="internal">ISBN 92 9017 032 8</a>
+<p><a href="/wiki/Special:Booksources/9290170328" class="internal">ISBN 92 9017 032 8</a>
 </p>
 !! end
 
@@ -6366,7 +6366,7 @@ ISBN 1234567890
 ISBN 12345678901
 !! result
 <p>ISBN 123456789
-</p><p><a href="/index.php?title=Special:Booksources&amp;isbn=1234567890" class="internal">ISBN 1234567890</a>
+</p><p><a href="/wiki/Special:Booksources/1234567890" class="internal">ISBN 1234567890</a>
 </p><p>ISBN 12345678901
 </p>
 !! end
@@ -6379,8 +6379,8 @@ ISBN 1-234-56789-0 - 2006
 
 ISBN 1 234 56789 0 - 2006
 !! result
-<p><a href="/index.php?title=Special:Booksources&amp;isbn=1234567890" class="internal">ISBN 1-234-56789-0</a> - 2006
-</p><p><a href="/index.php?title=Special:Booksources&amp;isbn=1234567890" class="internal">ISBN 1 234 56789 0</a> - 2006
+<p><a href="/wiki/Special:Booksources/1234567890" class="internal">ISBN 1-234-56789-0</a> - 2006
+</p><p><a href="/wiki/Special:Booksources/1234567890" class="internal">ISBN 1 234 56789 0</a> - 2006
 </p>
 !! end