| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -303,7 +303,7 @@ |
| 304 | 304 | * to internalParse() which does all the real work. |
| 305 | 305 | */ |
| 306 | 306 | |
| 307 | | - global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang, $wgDisableLangConversion, $wgUser, $wgRequest, $wgDisableTitleConversion, $wgDisableContentConversion; |
| | 307 | + global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang, $wgDisableLangConversion, $wgUser, $wgRequest, $wgDisableTitleConversion; |
| 308 | 308 | $fname = __METHOD__.'-' . wfGetCaller(); |
| 309 | 309 | wfProfileIn( __METHOD__ ); |
| 310 | 310 | wfProfileIn( $fname ); |
| — | — | @@ -375,7 +375,7 @@ |
| 376 | 376 | * rule but content conversion was not done, then the parser |
| 377 | 377 | * won't pick it up. This is probably expected behavior. |
| 378 | 378 | */ |
| 379 | | - if ( !( $wgDisableContentConversion |
| | 379 | + if ( !( $wgDisableLangConversion |
| 380 | 380 | || $wgDisableTitleConversion |
| 381 | 381 | || $wgRequest->getText( 'redirect', 'yes' ) == 'no' |
| 382 | 382 | || $wgRequest->getText( 'linkconvert', 'yes' ) == 'no' |