From: Magnus Manske <magnusmanske@users.mediawiki.org>
Date: Sun, 8 Aug 2004 18:05:41 +0000 (+0000)
Subject: (Hopefully) fixing various template bugs once and for all!
X-Git-Tag: 1.5.0alpha1~2465
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;ds=sidebyside;h=7b0686a4082107d9ddcdea6954268e22396049e5;p=lhc%2Fweb%2Fwiklou.git

(Hopefully) fixing various template bugs once and for all!
---

diff --git a/includes/Parser.php b/includes/Parser.php
index b2573e04ae..9e0f305c9e 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -854,6 +854,10 @@ class Parser
 		$text = $this->doMagicLinks( $text );
 		$text = $this->replaceInternalLinks ( $text );
 		$text = $this->replaceInternalLinks ( $text );
+				
+		$text = $this->unstrip( $text, $this->mStripState );
+		$text = $this->unstripNoWiki( $text, $this->mStripState );
+
 		$text = $this->doTableStuff( $text );
 		$text = $this->formatHeadings( $text, $isMain );
 		$sk =& $this->mOptions->getSkin();
@@ -1907,10 +1911,7 @@ class Parser
                         # Add a new element to the templace recursion path
 			$this->mTemplatePath[$part1] = 1;
 
-			# Run full parser on the included text
-			$text = $this->internalParse( $text, $newline, $assocArgs );
-			# I replaced the line below with the line above, as it former seems to cause several bugs
-			#$text = $this->stripParse( $text, $newline, $assocArgs );
+			$text = $this->stripParse( $text, $newline, $assocArgs );
 
 			# Resume the link cache and register the inclusion as a link
 			if ( !is_null( $title ) ) {