* (bug 8897) Fix whitespace removal for interlanguage links with link prefix

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8b84ab5..89f0ded 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -178,6 +178,7 @@ lighter making things easier to read.
 * Clean up session checks to better handle the case where the session was
   opened during the current request. May help with some caching corner
   cases.
+* (bug 8897) Fix whitespace removal for interlanguage links with link prefix
 
 
 == Languages updated ==

diff --git a/includes/Parser.php b/includes/Parser.php
index 66d6eb1..e975359 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1721,8 +1721,8 @@ class Parser
                                wfProfileIn( "$fname-interwiki" );
                                if( $iw && $this->mOptions->getInterwikiMagic() && $nottalk && $wgContLang->getLanguageName( $iw ) ) {
                                        $this->mOutput->addLanguageLink( $nt->getFullText() );
-                                       $s = rtrim($s . "\n");
-                                       $s .= trim($prefix . $trail, "\n") == '' ? '': $prefix . $trail;
+                                       $s = rtrim($s . $prefix);
+                                       $s .= trim($trail, "\n") == '' ? '': $prefix . $trail;
                                        wfProfileOut( "$fname-interwiki" );
                                        continue;
                                }

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 5162b36..4ddaac2 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1566,6 +1566,53 @@ Interwiki link with fragment (bug 2130)
 </p>
 !! end
 
+!! test
+Interlanguage link
+!! input
+Blah blah blah
+[[zh:Chinese]]
+!!result
+<p>Blah blah blah
+</p>
+!! end
+
+!! test
+Double interlanguage link
+!! input
+Blah blah blah
+[[es:Spanish]]
+[[zh:Chinese]]
+!!result
+<p>Blah blah blah
+</p>
+!! end
+
+!! test
+Interlanguage link, with prefix links
+!! options
+language=ln
+!! input
+Blah blah blah
+[[zh:Chinese]]
+!!result
+<p>Blah blah blah
+</p>
+!! end
+
+!! test
+Double interlanguage link, with prefix links (bug 8897)
+!! options
+language=ln
+!! input
+Blah blah blah
+[[es:Spanish]]
+[[zh:Chinese]]
+!!result
+<p>Blah blah blah
+</p>
+!! end
+
+
 ##
 ## XHTML tidiness
 ###