| Index: trunk/phase3/includes/parser/LinkHolderArray.php |
| — | — | @@ -162,9 +162,6 @@ |
| 163 | 163 | # Check if it's a static known link, e.g. interwiki |
| 164 | 164 | if ( $title->isAlwaysKnown() ) { |
| 165 | 165 | $colours[$pdbk] = ''; |
| 166 | | - if( $title->getInterwiki() != '' ) { |
| 167 | | - $output->addInterwikiLink( $title ); |
| 168 | | - } |
| 169 | 166 | } elseif ( ( $id = $linkCache->getGoodLinkID( $pdbk ) ) != 0 ) { |
| 170 | 167 | $colours[$pdbk] = $sk->getLinkColour( $title, $threshold ); |
| 171 | 168 | $output->addLink( $title, $id ); |
| — | — | @@ -269,9 +266,11 @@ |
| 270 | 267 | wfProfileIn( __METHOD__ ); |
| 271 | 268 | # Make interwiki link HTML |
| 272 | 269 | $sk = $this->parent->getOptions()->getSkin(); |
| | 270 | + $output = $this->parent->getOutput(); |
| 273 | 271 | $replacePairs = array(); |
| 274 | 272 | foreach( $this->interwikis as $key => $link ) { |
| 275 | 273 | $replacePairs[$key] = $sk->link( $link['title'], $link['text'] ); |
| | 274 | + $output->addInterwikiLink( $link['title'] ); |
| 276 | 275 | } |
| 277 | 276 | $replacer = new HashtableReplacer( $replacePairs, 1 ); |
| 278 | 277 | |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -1830,7 +1830,7 @@ |
| 1831 | 1831 | # |
| 1832 | 1832 | # FIXME: isAlwaysKnown() can be expensive for file links; we should really do |
| 1833 | 1833 | # batch file existence checks for NS_FILE and NS_MEDIA |
| 1834 | | - if ( $iw = '' && $nt->isAlwaysKnown() ) { |
| | 1834 | + if ( $iw == '' && $nt->isAlwaysKnown() ) { |
| 1835 | 1835 | $this->mOutput->addLink( $nt ); |
| 1836 | 1836 | $s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix ); |
| 1837 | 1837 | } else { |
| Index: trunk/phase3/includes/parser/ParserOutput.php |
| — | — | @@ -105,7 +105,6 @@ |
| 106 | 106 | * @param mixed $id optional known page_id so we can skip the lookup |
| 107 | 107 | */ |
| 108 | 108 | function addLink( $title, $id = null ) { |
| 109 | | - wfDebug(__METHOD__ . " got: " . $title->getPrefixedText() . "\n"); |
| 110 | 109 | if ( $title->isExternal() ) { |
| 111 | 110 | // Don't record interwikis in pagelinks |
| 112 | 111 | $this->addInterwikiLink( $title ); |