| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -570,14 +570,6 @@ |
| 571 | 571 | return $t ; |
| 572 | 572 | } |
| 573 | 573 | |
| 574 | | - # Parses the text and adds the result to the strip state |
| 575 | | - # Returns the strip tag |
| 576 | | - function stripParse( $text, $newline, $args ) { |
| 577 | | - $text = $this->strip( $text, $this->mStripState ); |
| 578 | | - $text = $this->internalParse( $text, (bool)$newline, $args, false ); |
| 579 | | - return $newline.$this->insertStripItem( $text, $this->mStripState ); |
| 580 | | - } |
| 581 | | - |
| 582 | 574 | function internalParse( $text, $linestart, $args = array(), $isMain=true ) { |
| 583 | 575 | global $wgLang; |
| 584 | 576 | |
| — | — | @@ -1705,7 +1697,8 @@ |
| 1706 | 1698 | # Add a new element to the templace recursion path |
| 1707 | 1699 | $this->mTemplatePath[$part1] = 1; |
| 1708 | 1700 | |
| 1709 | | - $text = $this->stripParse( $text, $newline, $assocArgs ); |
| | 1701 | + $text = $this->removeHTMLtags( $text ); |
| | 1702 | + $text = $this->replaceVariables( $text, $assocArgs ); |
| 1710 | 1703 | |
| 1711 | 1704 | # Resume the link cache and register the inclusion as a link |
| 1712 | 1705 | if ( !is_null( $title ) ) { |
| — | — | @@ -1732,7 +1725,8 @@ |
| 1733 | 1726 | $inputArgs = end( $this->mArgStack ); |
| 1734 | 1727 | |
| 1735 | 1728 | if ( array_key_exists( $arg, $inputArgs ) ) { |
| 1736 | | - $text = $this->stripParse( $inputArgs[$arg], $newline, array() ); |
| | 1729 | + $text = $this->removeHTMLtags( $inputArgs[$arg] ); |
| | 1730 | + $text = $this->replaceVariables( $text, array() ); |
| 1737 | 1731 | } |
| 1738 | 1732 | |
| 1739 | 1733 | return $text; |