Merge "Don't double escape in Linker::formatLinksInComment"

diff --git a/includes/Linker.php b/includes/Linker.php
index 3a039f6..238bb53 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1464,9 +1464,9 @@ class Linker {
 
                                                if ( $wikiId !== null ) {
                                                        $thelink = Linker::makeExternalLink(
-                                                               WikiMap::getForeignURL( $wikiId, $target->getPrefixedURL() ),
+                                                               WikiMap::getForeignURL( $wikiId, $target->getFullText() ),
                                                                $linkText . $inside,
-                                                               true
+                                                               /* escape = */ false // Already escaped
                                                        ) . $trail;
                                                } else {
                                                        $thelink = Linker::link(

diff --git a/tests/phpunit/includes/LinkerTest.php b/tests/phpunit/includes/LinkerTest.php
index 6341bf0..823c933 100644 (file)
--- a/tests/phpunit/includes/LinkerTest.php
+++ b/tests/phpunit/includes/LinkerTest.php
@@ -231,6 +231,11 @@ class LinkerTest extends MediaWikiLangTestCase {
                                'foo bar [[Special:BlankPage]]',
                                null,
                        ),
+                       array(
+                               '<a class="external" rel="nofollow" href="//en.example.org/w/Foo%27bar">Foo\'bar</a>',
+                               "[[Foo'bar]]",
+                               'enwiki',
+                       ),
                        array(
                                'foo bar <a class="external" rel="nofollow" href="//en.example.org/w/Special:BlankPage">Special:BlankPage</a>',
                                'foo bar [[Special:BlankPage]]',