From: Wil Mahan <wmahan@users.mediawiki.org>
Date: Sun, 26 Sep 2004 17:59:08 +0000 (+0000)
Subject: Fix problem with RFC magic links, as noted at bug 479
X-Git-Tag: 1.5.0alpha1~1765
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=c2756ebfa180f0007242a81cbc88d41d57cac76a;p=lhc%2Fweb%2Fwiklou.git

Fix problem with RFC magic links, as noted at bug 479
---

diff --git a/includes/Parser.php b/includes/Parser.php
index 4d78490d10..42b71dfc2f 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -658,11 +658,11 @@ class Parser
 			$text = $wgDateFormatter->reformat( $this->mOptions->getDateFormat(), $text );
 		}
 		$text = $this->doAllQuotes( $text );
-		$text = $this->doMagicLinks( $text );
 		$text = $this->replaceInternalLinks ( $text );
 		# Another call to replace links and images inside captions of images
 		$text = $this->replaceInternalLinks ( $text );
 		$text = $this->replaceExternalLinks( $text );
+		$text = $this->doMagicLinks( $text );
 		$text = $this->doTableStuff( $text );
 		$text = $this->formatHeadings( $text, $isMain );
 		$sk =& $this->mOptions->getSkin();
@@ -1550,12 +1550,16 @@ class Parser
 	 * @access private
 	 */
 	function initialiseVariables() {
+		$fname = 'Parser::initialiseVaraibles';
+		wfProfileIn( $fname );
 		global $wgVariableIDs;
 		$this->mVariables = array();
 		foreach ( $wgVariableIDs as $id ) {
 			$mw =& MagicWord::get( $id );
 			$mw->addToArray( $this->mVariables, $this->getVariableValue( $id ) );
 		}
+		$fname = 'Parser::initialiseVaraibles';
+		wfProfileOut( $fname );
 	}
 
 	/**