| Index: trunk/phase3/includes/specials/SpecialBlock.php |
| — | — | @@ -143,7 +143,7 @@ |
| 144 | 144 | 'required' => true, |
| 145 | 145 | 'tabindex' => '2', |
| 146 | 146 | 'options' => self::getSuggestedDurations(), |
| 147 | | - 'other' => wfMsg( 'ipbother' ), |
| | 147 | + 'other' => $this->msg( 'ipbother' )->text(), |
| 148 | 148 | ), |
| 149 | 149 | 'Reason' => array( |
| 150 | 150 | 'type' => 'selectandother', |
| — | — | @@ -310,7 +310,7 @@ |
| 311 | 311 | $s = Html::rawElement( |
| 312 | 312 | 'h2', |
| 313 | 313 | array(), |
| 314 | | - wfMsgExt( 'ipb-otherblocks-header', 'parseinline', count( $otherBlockMessages ) ) |
| | 314 | + $this->msg( 'ipb-otherblocks-header', count( $otherBlockMessages ) )->parse() |
| 315 | 315 | ) . "\n"; |
| 316 | 316 | |
| 317 | 317 | $list = ''; |
| — | — | @@ -342,16 +342,16 @@ |
| 343 | 343 | $contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->target->getName() ); |
| 344 | 344 | $links[] = Linker::link( |
| 345 | 345 | $contribsPage, |
| 346 | | - wfMsgExt( 'ipb-blocklist-contribs', 'escape', $this->target->getName() ) |
| | 346 | + $this->msg( 'ipb-blocklist-contribs', $this->target->getName() )->escaped() |
| 347 | 347 | ); |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | # Link to unblock the specified user, or to a blank unblock form |
| 351 | 351 | if( $this->target instanceof User ) { |
| 352 | | - $message = wfMsgExt( 'ipb-unblock-addr', array( 'parseinline' ), $this->target->getName() ); |
| | 352 | + $message = $this->msg( 'ipb-unblock-addr', $this->target->getName() )->parse(); |
| 353 | 353 | $list = SpecialPage::getTitleFor( 'Unblock', $this->target->getName() ); |
| 354 | 354 | } else { |
| 355 | | - $message = wfMsgExt( 'ipb-unblock', array( 'parseinline' ) ); |
| | 355 | + $message = $this->msg( 'ipb-unblock' )->parse(); |
| 356 | 356 | $list = SpecialPage::getTitleFor( 'Unblock' ); |
| 357 | 357 | } |
| 358 | 358 | $links[] = Linker::linkKnown( $list, $message, array() ); |
| — | — | @@ -359,7 +359,7 @@ |
| 360 | 360 | # Link to the block list |
| 361 | 361 | $links[] = Linker::linkKnown( |
| 362 | 362 | SpecialPage::getTitleFor( 'BlockList' ), |
| 363 | | - wfMsg( 'ipb-blocklist' ) |
| | 363 | + $this->msg( 'ipb-blocklist' )->escaped() |
| 364 | 364 | ); |
| 365 | 365 | |
| 366 | 366 | $user = $this->getUser(); |
| — | — | @@ -368,7 +368,7 @@ |
| 369 | 369 | if ( $user->isAllowed( 'editinterface' ) ) { |
| 370 | 370 | $links[] = Linker::link( |
| 371 | 371 | Title::makeTitle( NS_MEDIAWIKI, 'Ipbreason-dropdown' ), |
| 372 | | - wfMsgHtml( 'ipb-edit-dropdown' ), |
| | 372 | + $this->msg( 'ipb-edit-dropdown' )->escaped(), |
| 373 | 373 | array(), |
| 374 | 374 | array( 'action' => 'edit' ) |
| 375 | 375 | ); |