| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -348,8 +348,8 @@ |
| 349 | 349 | * The page doesn't get language converted if |
| 350 | 350 | * a) It's disabled |
| 351 | 351 | * b) Titles aren't converted |
| 352 | | - * c) Content isn't converted and this is not a talk page |
| 353 | | - * d) It's a conversion table |
| | 352 | + * c) Content isn't converted and this is not a talk page |
| | 353 | + * d) It's a conversion table |
| 354 | 354 | */ |
| 355 | 355 | if ( !( $wgDisableLangConversion |
| 356 | 356 | || isset( $this->mDoubleUnderscores['notitleconvert'] ) |
| Index: branches/wmf/1.16wmf4/includes/parser/Parser.php |
| — | — | @@ -346,12 +346,22 @@ |
| 347 | 347 | |
| 348 | 348 | $this->replaceLinkHolders( $text ); |
| 349 | 349 | |
| 350 | | - // The position of the convert() call should not be changed. it |
| 351 | | - // assumes that the links are all replaced and the only thing left |
| 352 | | - // is the <nowiki> mark. |
| | 350 | + /** |
| | 351 | + * The page doesn't get language converted if |
| | 352 | + * a) It's disabled |
| | 353 | + * b) Titles aren't converted |
| | 354 | + * c) Content isn't converted and this is not a talk page |
| | 355 | + * d) It's a conversion table |
| | 356 | + */ |
| 353 | 357 | if ( !( $wgDisableLangConversion |
| 354 | | - || isset( $this->mDoubleUnderscores['nocontentconvert'] ) |
| | 358 | + || isset( $this->mDoubleUnderscores['notitleconvert'] ) |
| | 359 | + || ( isset( $this->mDoubleUnderscores['nocontentconvert'] ) && !$this->mTitle->isTalkPage() ) |
| 355 | 360 | || $this->mTitle->isConversionTable() ) ) { |
| | 361 | + |
| | 362 | + # The position of the convert() call should not be changed. it |
| | 363 | + # assumes that the links are all replaced and the only thing left |
| | 364 | + # is the <nowiki> mark. |
| | 365 | + |
| 356 | 366 | $text = $wgContLang->convert( $text ); |
| 357 | 367 | } |
| 358 | 368 | |
| Index: branches/REL1_16/phase3/includes/parser/Parser.php |
| — | — | @@ -346,12 +346,22 @@ |
| 347 | 347 | |
| 348 | 348 | $this->replaceLinkHolders( $text ); |
| 349 | 349 | |
| 350 | | - // The position of the convert() call should not be changed. it |
| 351 | | - // assumes that the links are all replaced and the only thing left |
| 352 | | - // is the <nowiki> mark. |
| | 350 | + /** |
| | 351 | + * The page doesn't get language converted if |
| | 352 | + * a) It's disabled |
| | 353 | + * b) Titles aren't converted |
| | 354 | + * c) Content isn't converted and this is not a talk page |
| | 355 | + * d) It's a conversion table |
| | 356 | + */ |
| 353 | 357 | if ( !( $wgDisableLangConversion |
| 354 | | - || isset( $this->mDoubleUnderscores['nocontentconvert'] ) |
| | 358 | + || isset( $this->mDoubleUnderscores['notitleconvert'] ) |
| | 359 | + || ( isset( $this->mDoubleUnderscores['nocontentconvert'] ) && !$this->mTitle->isTalkPage() ) |
| 355 | 360 | || $this->mTitle->isConversionTable() ) ) { |
| | 361 | + |
| | 362 | + # The position of the convert() call should not be changed. it |
| | 363 | + # assumes that the links are all replaced and the only thing left |
| | 364 | + # is the <nowiki> mark. |
| | 365 | + |
| 356 | 366 | $text = $wgContLang->convert( $text ); |
| 357 | 367 | } |
| 358 | 368 | |