| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -1434,11 +1434,6 @@ |
| 1435 | 1435 | # PHP global rebinding syntax is a bit weird, need to use the GLOBALS array |
| 1436 | 1436 | $GLOBALS['wgCurParser'] =& $this; |
| 1437 | 1437 | |
| 1438 | | - if ( $this->mOutputType == OT_HTML || $this->mOutputType == OT_MSG ) { |
| 1439 | | - # Variable substitution |
| 1440 | | - $text = preg_replace_callback( "/{{([$titleChars]*?)}}/", 'wfVariableSubstitution', $text ); |
| 1441 | | - } |
| 1442 | | - |
| 1443 | 1438 | if ( $this->mOutputType == OT_HTML ) { |
| 1444 | 1439 | # Argument substitution |
| 1445 | 1440 | $text = preg_replace_callback( "/{{{([$titleChars]*?)}}}/", 'wfArgSubstitution', $text ); |
| — | — | @@ -1453,19 +1448,6 @@ |
| 1454 | 1449 | return $text; |
| 1455 | 1450 | } |
| 1456 | 1451 | |
| 1457 | | - function variableSubstitution( $matches ) { |
| 1458 | | - if ( !$this->mVariables ) { |
| 1459 | | - $this->initialiseVariables(); |
| 1460 | | - } |
| 1461 | | - if ( array_key_exists( $matches[1], $this->mVariables ) ) { |
| 1462 | | - $text = $this->mVariables[$matches[1]]; |
| 1463 | | - $this->mOutput->mContainsOldMagic = true; |
| 1464 | | - } else { |
| 1465 | | - $text = $matches[0]; |
| 1466 | | - } |
| 1467 | | - return $text; |
| 1468 | | - } |
| 1469 | | - |
| 1470 | 1452 | # Split template arguments |
| 1471 | 1453 | function getTemplateArgs( $argsString ) { |
| 1472 | 1454 | if ( $argsString === '' ) { |
| — | — | @@ -2558,11 +2540,6 @@ |
| 2559 | 2541 | return $wgCurParser->argSubstitution( $matches ); |
| 2560 | 2542 | } |
| 2561 | 2543 | |
| 2562 | | -function wfVariableSubstitution( $matches ) { |
| 2563 | | - global $wgCurParser; |
| 2564 | | - return $wgCurParser->variableSubstitution( $matches ); |
| 2565 | | -} |
| 2566 | | - |
| 2567 | 2544 | /** |
| 2568 | 2545 | * Return the total number of articles |
| 2569 | 2546 | */ |