Merge "Fix self link issues about titles in different or mixed variants"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 31 Jan 2013 20:46:49 +0000 (20:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 31 Jan 2013 20:46:49 +0000 (20:46 +0000)
1  2 
includes/parser/Parser.php
tests/parser/parserTests.txt

@@@ -1806,14 -1814,8 +1806,8 @@@ class Parser 
                        $prefix = '';
                }
  
-               if ( $this->getConverterLanguage()->hasVariants() ) {
-                       $selflink = $this->getConverterLanguage()->autoConvertToAllVariants(
-                               $this->mTitle->getPrefixedText() );
-               } else {
-                       $selflink = array( $this->mTitle->getPrefixedText() );
-               }
                $useSubpages = $this->areSubpagesAllowed();
 -              wfProfileOut( __METHOD__.'-setup' );
 +              wfProfileOut( __METHOD__ . '-setup' );
  
                # Loop for each link
                for ( ; $line !== false && $line !== null ; $a->next(), $line = $a->current() ) {
Simple merge