| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -658,11 +658,11 @@ |
| 659 | 659 | $text = $wgDateFormatter->reformat( $this->mOptions->getDateFormat(), $text ); |
| 660 | 660 | } |
| 661 | 661 | $text = $this->doAllQuotes( $text ); |
| 662 | | - $text = $this->doMagicLinks( $text ); |
| 663 | 662 | $text = $this->replaceInternalLinks ( $text ); |
| 664 | 663 | # Another call to replace links and images inside captions of images |
| 665 | 664 | $text = $this->replaceInternalLinks ( $text ); |
| 666 | 665 | $text = $this->replaceExternalLinks( $text ); |
| | 666 | + $text = $this->doMagicLinks( $text ); |
| 667 | 667 | $text = $this->doTableStuff( $text ); |
| 668 | 668 | $text = $this->formatHeadings( $text, $isMain ); |
| 669 | 669 | $sk =& $this->mOptions->getSkin(); |
| — | — | @@ -1550,12 +1550,16 @@ |
| 1551 | 1551 | * @access private |
| 1552 | 1552 | */ |
| 1553 | 1553 | function initialiseVariables() { |
| | 1554 | + $fname = 'Parser::initialiseVaraibles'; |
| | 1555 | + wfProfileIn( $fname ); |
| 1554 | 1556 | global $wgVariableIDs; |
| 1555 | 1557 | $this->mVariables = array(); |
| 1556 | 1558 | foreach ( $wgVariableIDs as $id ) { |
| 1557 | 1559 | $mw =& MagicWord::get( $id ); |
| 1558 | 1560 | $mw->addToArray( $this->mVariables, $this->getVariableValue( $id ) ); |
| 1559 | 1561 | } |
| | 1562 | + $fname = 'Parser::initialiseVaraibles'; |
| | 1563 | + wfProfileOut( $fname ); |
| 1560 | 1564 | } |
| 1561 | 1565 | |
| 1562 | 1566 | /** |