| Index: branches/wmf/1.16wmf4/includes/parser/Parser.php |
| — | — | @@ -387,10 +387,9 @@ |
| 388 | 388 | $convruletitle = $wgContLang->getConvRuleTitle(); |
| 389 | 389 | if ( $convruletitle ) { |
| 390 | 390 | $this->mOutput->setTitleText( $convruletitle ); |
| | 391 | + } else { |
| | 392 | + $this->mOutput->setTitleText( $wgContLang->convert( $this->mOutput->getTitleText() ) ); |
| 391 | 393 | } |
| 392 | | - else { |
| 393 | | - $this->mOutput->setTitleText( $wgContLang->convert( $title->getPrefixedText() ) ); |
| 394 | | - } |
| 395 | 394 | } |
| 396 | 395 | |
| 397 | 396 | $text = $this->mStripState->unstripNoWiki( $text ); |
| Property changes on: branches/wmf/1.16wmf4/includes/parser |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 398 | 397 | + /branches/REL1_15/phase3/includes/parser:51646 |
| /branches/sqlite/includes/parser:58211-58321 |
| /branches/wmf-deployment/includes/parser:53381,60970 |
| /trunk/phase3/includes/parser:63549,63764,63897-63901,64827 |