Index: trunk/phase3/includes/parser/Parser.php |
— | — | @@ -329,18 +329,11 @@ |
330 | 330 | } |
331 | 331 | |
332 | 332 | /** |
333 | | - * A page get its title converted except: |
334 | | - * a) Language conversion is globally disabled |
335 | | - * b) Title convert is globally disabled |
336 | | - * c) The page is a redirect page |
337 | | - * d) User request with a "linkconvert" set to "no" |
338 | | - * e) A "nocontentconvert" magic word has been set |
339 | | - * f) A "notitleconvert" magic word has been set |
340 | | - * g) User sets "noconvertlink" in his/her preference |
341 | | - * |
342 | | - * Note that if a user tries to set a title in a conversion |
343 | | - * rule but content conversion was not done, then the parser |
344 | | - * won't pick it up. This is probably expected behavior. |
| 333 | + * A converted title will be provided in the output object if title and |
| 334 | + * content conversion are enabled, the article text does not contain |
| 335 | + * a conversion-suppressing double-underscore tag, and no |
| 336 | + * {{DISPLAYTITLE:...}} is present. DISPLAYTITLE takes precedence over |
| 337 | + * automatic link conversion. |
345 | 338 | */ |
346 | 339 | if ( !( $wgDisableLangConversion |
347 | 340 | || $wgDisableTitleConversion |