Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove code that is unnecessary now that titles no longer contain

Browse source 
'{' or '}'; fix regex greediness bug in HTML comment removal.
This commit is contained in:
Wil Mahan 2004-09-19 08:58:09 +00:00
parent 474968e5ea
commit 87fe496e8f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/Parser.php
View file

@ -1426,9 +1426,7 @@ class Parser
$fname = 'Parser::replaceVariables';
wfProfileIn( $fname );
$bail = false;
$titleChars = Title::legalChars();
$nonBraceChars = str_replace( array( '{', '}' ), array( '', '' ), $titleChars );
# This function is called recursively. To keep track of arguments we need a stack:
array_push( $this->mArgStack, $args );
@ -1438,7 +1436,7 @@ class Parser
if ( $this->mOutputType == OT_HTML || $this->mOutputType == OT_MSG ) {
# Variable substitution
$text = preg_replace_callback( "/{{([$nonBraceChars]*?)}}/", 'wfVariableSubstitution', $text );
$text = preg_replace_callback( "/{{([$titleChars]*?)}}/", 'wfVariableSubstitution', $text );
}
if ( $this->mOutputType == OT_HTML ) {
@ -1446,7 +1444,7 @@ class Parser
$text = preg_replace_callback( "/{{{([$titleChars]*?)}}}/", 'wfArgSubstitution', $text );
}
# Template substitution
$regex = '/{{(['.$nonBraceChars.']*)(\\|.*?|)}}/s';
$regex = '/{{(['.$titleChars.']*)(\\|.*?|)}}/s';
$text = preg_replace_callback( $regex, 'wfBraceSubstitution', $text );
array_pop( $this->mArgStack );
@ -1781,7 +1779,7 @@ class Parser
$htmlattrs = $this->getHTMLattrs () ;
# Remove HTML comments
$text = preg_replace( '/(\\n *<!--.*--> *|<!--.*?-->)/sU', '', $text );
$text = preg_replace( '/(\\n *<!--.*--> *|<!--.*-->)/sU', '', $text );
$bits = explode( '<', $text );
$text = array_shift( $bits );