| Index: trunk/phase3/maintenance/parserTests.txt |
| — | — | @@ -1566,6 +1566,53 @@ |
| 1567 | 1567 | </p> |
| 1568 | 1568 | !! end |
| 1569 | 1569 | |
| | 1570 | +!! test |
| | 1571 | +Interlanguage link |
| | 1572 | +!! input |
| | 1573 | +Blah blah blah |
| | 1574 | +[[zh:Chinese]] |
| | 1575 | +!!result |
| | 1576 | +<p>Blah blah blah |
| | 1577 | +</p> |
| | 1578 | +!! end |
| | 1579 | + |
| | 1580 | +!! test |
| | 1581 | +Double interlanguage link |
| | 1582 | +!! input |
| | 1583 | +Blah blah blah |
| | 1584 | +[[es:Spanish]] |
| | 1585 | +[[zh:Chinese]] |
| | 1586 | +!!result |
| | 1587 | +<p>Blah blah blah |
| | 1588 | +</p> |
| | 1589 | +!! end |
| | 1590 | + |
| | 1591 | +!! test |
| | 1592 | +Interlanguage link, with prefix links |
| | 1593 | +!! options |
| | 1594 | +language=ln |
| | 1595 | +!! input |
| | 1596 | +Blah blah blah |
| | 1597 | +[[zh:Chinese]] |
| | 1598 | +!!result |
| | 1599 | +<p>Blah blah blah |
| | 1600 | +</p> |
| | 1601 | +!! end |
| | 1602 | + |
| | 1603 | +!! test |
| | 1604 | +Double interlanguage link, with prefix links (bug 8897) |
| | 1605 | +!! options |
| | 1606 | +language=ln |
| | 1607 | +!! input |
| | 1608 | +Blah blah blah |
| | 1609 | +[[es:Spanish]] |
| | 1610 | +[[zh:Chinese]] |
| | 1611 | +!!result |
| | 1612 | +<p>Blah blah blah |
| | 1613 | +</p> |
| | 1614 | +!! end |
| | 1615 | + |
| | 1616 | + |
| 1570 | 1617 | ## |
| 1571 | 1618 | ## XHTML tidiness |
| 1572 | 1619 | ### |
| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -1721,8 +1721,8 @@ |
| 1722 | 1722 | wfProfileIn( "$fname-interwiki" ); |
| 1723 | 1723 | if( $iw && $this->mOptions->getInterwikiMagic() && $nottalk && $wgContLang->getLanguageName( $iw ) ) { |
| 1724 | 1724 | $this->mOutput->addLanguageLink( $nt->getFullText() ); |
| 1725 | | - $s = rtrim($s . "\n"); |
| 1726 | | - $s .= trim($prefix . $trail, "\n") == '' ? '': $prefix . $trail; |
| | 1725 | + $s = rtrim($s . $prefix); |
| | 1726 | + $s .= trim($trail, "\n") == '' ? '': $prefix . $trail; |
| 1727 | 1727 | wfProfileOut( "$fname-interwiki" ); |
| 1728 | 1728 | continue; |
| 1729 | 1729 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -178,6 +178,7 @@ |
| 179 | 179 | * Clean up session checks to better handle the case where the session was |
| 180 | 180 | opened during the current request. May help with some caching corner |
| 181 | 181 | cases. |
| | 182 | +* (bug 8897) Fix whitespace removal for interlanguage links with link prefix |
| 182 | 183 | |
| 183 | 184 | |
| 184 | 185 | == Languages updated == |