| 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; |
| | 307 | + global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang, $wgDisableLangConversion, $wgDisableTitleConversion, $wgUser, $wgRequest; |
| 308 | 308 | $fname = __METHOD__.'-' . wfGetCaller(); |
| 309 | 309 | wfProfileIn( __METHOD__ ); |
| 310 | 310 | wfProfileIn( $fname ); |
| — | — | @@ -363,7 +363,7 @@ |
| 364 | 364 | |
| 365 | 365 | /** |
| 366 | 366 | * A page get its title converted except: |
| 367 | | - * a) Content convert is globally disabled |
| | 367 | + * a) Language conversion is globally disabled |
| 368 | 368 | * b) Title convert is globally disabled |
| 369 | 369 | * c) The page is a redirect page |
| 370 | 370 | * d) User request with a "linkconvert" set to "no" |
| Index: branches/wmf/1.16wmf4/includes/parser/Parser.php |
| — | — | @@ -365,7 +365,7 @@ |
| 366 | 366 | |
| 367 | 367 | /** |
| 368 | 368 | * A page get its title converted except: |
| 369 | | - * a) Content convert is globally disabled |
| | 369 | + * a) Language conversion is globally disabled |
| 370 | 370 | * b) Title convert is globally disabled |
| 371 | 371 | * c) The page is a redirect page |
| 372 | 372 | * d) User request with a "linkconvert" set to "no" |
| — | — | @@ -377,7 +377,7 @@ |
| 378 | 378 | * rule but content conversion was not done, then the parser |
| 379 | 379 | * won't pick it up. This is probably expected behavior. |
| 380 | 380 | */ |
| 381 | | - if ( !( $wgDisableContentConversion |
| | 381 | + if ( !( $wgDisableLangConversion |
| 382 | 382 | || $wgDisableTitleConversion |
| 383 | 383 | || $wgRequest->getText( 'redirect', 'yes' ) == 'no' |
| 384 | 384 | || $wgRequest->getText( 'linkconvert', 'yes' ) == 'no' |
| Index: branches/REL1_16/phase3/includes/parser/Parser.php |
| — | — | @@ -365,7 +365,7 @@ |
| 366 | 366 | |
| 367 | 367 | /** |
| 368 | 368 | * A page get its title converted except: |
| 369 | | - * a) Content convert is globally disabled |
| | 369 | + * a) Language conversion is globally disabled |
| 370 | 370 | * b) Title convert is globally disabled |
| 371 | 371 | * c) The page is a redirect page |
| 372 | 372 | * d) User request with a "linkconvert" set to "no" |
| — | — | @@ -377,7 +377,7 @@ |
| 378 | 378 | * rule but content conversion was not done, then the parser |
| 379 | 379 | * won't pick it up. This is probably expected behavior. |
| 380 | 380 | */ |
| 381 | | - if ( !( $wgDisableContentConversion |
| | 381 | + if ( !( $wgDisableLangConversion |
| 382 | 382 | || $wgDisableTitleConversion |
| 383 | 383 | || $wgRequest->getText( 'redirect', 'yes' ) == 'no' |
| 384 | 384 | || $wgRequest->getText( 'linkconvert', 'yes' ) == 'no' |