| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -3425,7 +3425,7 @@ |
| 3426 | 3426 | ); |
| 3427 | 3427 | $text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text ); |
| 3428 | 3428 | $text = $this->strip( $text, $stripState, true ); |
| 3429 | | - $text = $this->pstPass2( $text, $user ); |
| | 3429 | + $text = $this->pstPass2( $text, $stripState, $user ); |
| 3430 | 3430 | $text = $this->unstrip( $text, $stripState ); |
| 3431 | 3431 | $text = $this->unstripNoWiki( $text, $stripState ); |
| 3432 | 3432 | return $text; |
| — | — | @@ -3435,13 +3435,13 @@ |
| 3436 | 3436 | * Pre-save transform helper function |
| 3437 | 3437 | * @private |
| 3438 | 3438 | */ |
| 3439 | | - function pstPass2( $text, &$user ) { |
| | 3439 | + function pstPass2( $text, &$stripState, &$user ) { |
| 3440 | 3440 | global $wgContLang, $wgLocaltimezone; |
| 3441 | 3441 | |
| 3442 | 3442 | /* Note: This is the timestamp saved as hardcoded wikitext to |
| 3443 | 3443 | * the database, we use $wgContLang here in order to give |
| 3444 | | - * everyone the same signiture and use the default one rather |
| 3445 | | - * than the one selected in each users preferences. |
| | 3444 | + * everyone the same signature and use the default one rather |
| | 3445 | + * than the one selected in each user's preferences. |
| 3446 | 3446 | */ |
| 3447 | 3447 | if ( isset( $wgLocaltimezone ) ) { |
| 3448 | 3448 | $oldtz = getenv( 'TZ' ); |
| — | — | @@ -3457,6 +3457,9 @@ |
| 3458 | 3458 | # Because mOutputType is OT_WIKI, this will only process {{subst:xxx}} type tags |
| 3459 | 3459 | $text = $this->replaceVariables( $text ); |
| 3460 | 3460 | |
| | 3461 | + # Strip out <nowiki> etc. added via replaceVariables |
| | 3462 | + $text = $this->strip( $text, &$stripState ); |
| | 3463 | + |
| 3461 | 3464 | # Signatures |
| 3462 | 3465 | $sigText = $this->getUserSig( $user ); |
| 3463 | 3466 | $text = strtr( $text, array( |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -136,6 +136,7 @@ |
| 137 | 137 | * (bug 5679): format number on timeanddate() calls for fa: hi: bn:. |
| 138 | 138 | * (bug 5751) Updates to Portuguese localisation files |
| 139 | 139 | * (bug 5741) Introduce {{NUMBEROFUSERS}} magic word |
| | 140 | +* (bug 93) <nowiki> tags and tildes in templates |
| 140 | 141 | |
| 141 | 142 | == Compatibility == |
| 142 | 143 | |