| Index: trunk/phase3/includes/specials/SpecialWhatlinkshere.php |
| — | — | @@ -287,7 +287,7 @@ |
| 288 | 288 | 'whatlinkshere-links', 'isimage' ); |
| 289 | 289 | $msgcache = array(); |
| 290 | 290 | foreach ( $msgs as $msg ) { |
| 291 | | - $msgcache[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) ); |
| | 291 | + $msgcache[$msg] = $this->msg( $msg )->escaped(); |
| 292 | 292 | } |
| 293 | 293 | } |
| 294 | 294 | |
| — | — | @@ -355,8 +355,8 @@ |
| 356 | 356 | |
| 357 | 357 | function getPrevNext( $prevId, $nextId ) { |
| 358 | 358 | $currentLimit = $this->opts->getValue( 'limit' ); |
| 359 | | - $prev = wfMessage( 'whatlinkshere-prev' )->numParams( $currentLimit )->escaped(); |
| 360 | | - $next = wfMessage( 'whatlinkshere-next' )->numParams( $currentLimit )->escaped(); |
| | 359 | + $prev = $this->msg( 'whatlinkshere-prev' )->numParams( $currentLimit )->escaped(); |
| | 360 | + $next = $this->msg( 'whatlinkshere-next' )->numParams( $currentLimit )->escaped(); |
| 361 | 361 | |
| 362 | 362 | $changed = $this->opts->getChangedValues(); |
| 363 | 363 | unset($changed['target']); // Already in the request title |
| — | — | @@ -380,7 +380,7 @@ |
| 381 | 381 | |
| 382 | 382 | $nums = $lang->pipeList( $limitLinks ); |
| 383 | 383 | |
| 384 | | - return wfMsgHtml( 'viewprevnext', $prev, $next, $nums ); |
| | 384 | + return $this->msg( 'viewprevnext' )->rawParams( $prev, $next, $nums )->escaped(); |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | function whatlinkshereForm() { |
| — | — | @@ -403,22 +403,22 @@ |
| 404 | 404 | $f .= Html::hidden( $name, $value ); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | | - $f .= Xml::fieldset( wfMsg( 'whatlinkshere' ) ); |
| | 407 | + $f .= Xml::fieldset( $this->msg( 'whatlinkshere' )->text() ); |
| 408 | 408 | |
| 409 | 409 | # Target input |
| 410 | | - $f .= Xml::inputLabel( wfMsg( 'whatlinkshere-page' ), 'target', |
| | 410 | + $f .= Xml::inputLabel( $this->msg( 'whatlinkshere-page' )->text(), 'target', |
| 411 | 411 | 'mw-whatlinkshere-target', 40, $target ); |
| 412 | 412 | |
| 413 | 413 | $f .= ' '; |
| 414 | 414 | |
| 415 | 415 | # Namespace selector |
| 416 | | - $f .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' . |
| | 416 | + $f .= Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' . |
| 417 | 417 | Xml::namespaceSelector( $namespace, '' ); |
| 418 | 418 | |
| 419 | 419 | $f .= ' '; |
| 420 | 420 | |
| 421 | 421 | # Submit |
| 422 | | - $f .= Xml::submitButton( wfMsg( 'allpagessubmit' ) ); |
| | 422 | + $f .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ); |
| 423 | 423 | |
| 424 | 424 | # Close |
| 425 | 425 | $f .= Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ) . "\n"; |
| — | — | @@ -432,8 +432,8 @@ |
| 433 | 433 | * @return string HTML fieldset and filter panel with the show/hide links |
| 434 | 434 | */ |
| 435 | 435 | function getFilterPanel() { |
| 436 | | - $show = wfMsgHtml( 'show' ); |
| 437 | | - $hide = wfMsgHtml( 'hide' ); |
| | 436 | + $show = $this->msg( 'show' )->escaped(); |
| | 437 | + $hide = $this->msg( 'hide' )->escaped(); |
| 438 | 438 | |
| 439 | 439 | $changed = $this->opts->getChangedValues(); |
| 440 | 440 | unset($changed['target']); // Already in the request title |
| — | — | @@ -449,8 +449,9 @@ |
| 450 | 450 | $chosen = $this->opts->getValue( $type ); |
| 451 | 451 | $msg = $chosen ? $show : $hide; |
| 452 | 452 | $overrides = array( $type => !$chosen ); |
| 453 | | - $links[] = wfMsgHtml( "whatlinkshere-{$type}", $this->makeSelfLink( $msg, array_merge( $changed, $overrides ) ) ); |
| | 453 | + $links[] = $this->msg( "whatlinkshere-{$type}" )->rawParams( |
| | 454 | + $this->makeSelfLink( $msg, array_merge( $changed, $overrides ) ) )->escaped(); |
| 454 | 455 | } |
| 455 | | - return Xml::fieldset( wfMsg( 'whatlinkshere-filters' ), $this->getLanguage()->pipeList( $links ) ); |
| | 456 | + return Xml::fieldset( $this->msg( 'whatlinkshere-filters' )->text(), $this->getLanguage()->pipeList( $links ) ); |
| 456 | 457 | } |
| 457 | 458 | } |