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