Index: Parser.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Parser.php,v
retrieving revision 1.269
diff -u -u -r1.269 Parser.php
--- Parser.php	15 Sep 2004 05:53:21 -0000	1.269
+++ Parser.php	16 Sep 2004 19:36:01 -0000
@@ -570,14 +570,6 @@
 		return $t ;
 	}
 
-	# Parses the text and adds the result to the strip state
-	# Returns the strip tag
-	function stripParse( $text, $newline, $args ) {
-		$text = $this->strip( $text, $this->mStripState );
-		$text = $this->internalParse( $text, (bool)$newline, $args, false );
-		return $newline.$this->insertStripItem( $text, $this->mStripState );
-	}
-
 	function internalParse( $text, $linestart, $args = array(), $isMain=true ) {
 		$fname = 'Parser::internalParse';
 		wfProfileIn( $fname );
@@ -1701,7 +1693,8 @@
 			# Add a new element to the templace recursion path
 			$this->mTemplatePath[$part1] = 1;
 
-			$text = $this->stripParse( $text, $newline, $assocArgs );
+			$text = $this->removeHTMLtags( $text );
+			$text = $this->replaceVariables( $text, $assocArgs );
 
 			# Resume the link cache and register the inclusion as a link
 			if ( !is_null( $title ) ) {
@@ -1728,7 +1721,8 @@
 		$inputArgs = end( $this->mArgStack );
 
 		if ( array_key_exists( $arg, $inputArgs ) ) {
-			$text = $this->stripParse( $inputArgs[$arg], $newline, array() );
+			$text = $this->removeHTMLtags( $inputArgs[$arg] );
+			$text = $this->replaceVariables( $text, array() );
 		}
 
 		return $text;