| Index: trunk/phase3/maintenance/parserTests.inc |
| — | — | @@ -556,6 +556,8 @@ |
| 557 | 557 | 'wgHtml5' => true, |
| 558 | 558 | 'wgWellFormedXml' => true, |
| 559 | 559 | 'wgAllowMicrodataAttributes' => true, |
| | 560 | + 'wgAllowDisplayTitle' => true, |
| | 561 | + 'wgRestrictDisplayTitle' => false, |
| 560 | 562 | ); |
| 561 | 563 | |
| 562 | 564 | if ($config) { |
| Index: trunk/phase3/maintenance/parserTests.txt |
| — | — | @@ -7781,8 +7781,31 @@ |
| 7782 | 7782 | </p> |
| 7783 | 7783 | !! end |
| 7784 | 7784 | |
| | 7785 | +!! test |
| | 7786 | +Verify that displaytitle works (bug #22501) no displaytitle |
| | 7787 | +!! options |
| | 7788 | +showtitle |
| | 7789 | +!! input |
| | 7790 | +this is not the the title |
| | 7791 | +!! result |
| 7785 | 7792 | |
| | 7793 | +<p>this is not the the title |
| | 7794 | +</p> |
| | 7795 | +!! end |
| 7786 | 7796 | |
| | 7797 | +!! test |
| | 7798 | +Verify that displaytitle works (bug #22501) |
| | 7799 | +!! options |
| | 7800 | +showtitle |
| | 7801 | +!! input |
| | 7802 | +this is not the the title |
| | 7803 | +{{DISPLAYTITLE:screen}} |
| | 7804 | +!! result |
| | 7805 | +screen |
| | 7806 | +<p>this is not the the title |
| | 7807 | +</p> |
| | 7808 | +!! end |
| | 7809 | + |
| 7787 | 7810 | TODO: |
| 7788 | 7811 | more images |
| 7789 | 7812 | more tables |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -365,13 +365,6 @@ |
| 366 | 366 | // won't pick it up. This is probably expected behavior. |
| 367 | 367 | if ( $wgContLang->getConvRuleTitle() ) { |
| 368 | 368 | $this->mOutput->setTitleText( $wgContLang->getConvRuleTitle() ); |
| 369 | | - } elseif ( !( $wgDisableLangConversion |
| 370 | | - || isset( $this->mDoubleUnderscores['notitleconvert'] ) ) ) { |
| 371 | | - if ( $title->getNamespace() == NS_SPECIAL ) { |
| 372 | | - $this->setTitle( $wgContLang->convert( $title ) ); |
| 373 | | - } else { |
| 374 | | - $this->mOutput->setTitleText( $wgContLang->convert( $title->getPrefixedText() ) ); |
| 375 | | - } |
| 376 | 369 | } |
| 377 | 370 | |
| 378 | 371 | $text = $this->mStripState->unstripNoWiki( $text ); |