| Index: trunk/phase3/includes/SpecialPage.php |
| — | — | @@ -558,7 +558,7 @@ |
| 559 | 559 | } else { |
| 560 | 560 | $msg = $summaryMessageKey; |
| 561 | 561 | } |
| 562 | | - if ( !wfMessage( $msg )->isBlank() and ! $this->including() ) { |
| | 562 | + if ( !$this->msg( $msg )->isBlank() && !$this->including() ) { |
| 563 | 563 | $this->getOutput()->wrapWikiMsg( |
| 564 | 564 | "<div class='mw-specialpage-summary'>\n$1\n</div>", $msg ); |
| 565 | 565 | } |
| — | — | @@ -576,7 +576,7 @@ |
| 577 | 577 | * @return String |
| 578 | 578 | */ |
| 579 | 579 | function getDescription() { |
| 580 | | - return wfMsg( strtolower( $this->mName ) ); |
| | 580 | + return $this->msg( strtolower( $this->mName ) )->text(); |
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | /** |
| — | — | @@ -742,9 +742,9 @@ |
| 743 | 743 | |
| 744 | 744 | $form = new HTMLForm( $this->fields, $this->getContext() ); |
| 745 | 745 | $form->setSubmitCallback( array( $this, 'onSubmit' ) ); |
| 746 | | - $form->setWrapperLegend( wfMessage( strtolower( $this->getName() ) . '-legend' ) ); |
| | 746 | + $form->setWrapperLegend( $this->msg( strtolower( $this->getName() ) . '-legend' ) ); |
| 747 | 747 | $form->addHeaderText( |
| 748 | | - wfMessage( strtolower( $this->getName() ) . '-text' )->parseAsBlock() ); |
| | 748 | + $this->msg( strtolower( $this->getName() ) . '-text' )->parseAsBlock() ); |
| 749 | 749 | |
| 750 | 750 | // Retain query parameters (uselang etc) |
| 751 | 751 | $params = array_diff_key( |