Use local context to get messages

diff --git a/includes/specials/SpecialWhatlinkshere.php b/includes/specials/SpecialWhatlinkshere.php
index e55374e..0950165 100644 (file)
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -287,7 +287,7 @@ class SpecialWhatLinksHere extends SpecialPage {
                                'whatlinkshere-links', 'isimage' );
                        $msgcache = array();
                        foreach ( $msgs as $msg ) {
-                               $msgcache[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
+                               $msgcache[$msg] = $this->msg( $msg )->escaped();
                        }
                }
 
@@ -355,8 +355,8 @@ class SpecialWhatLinksHere extends SpecialPage {
 
        function getPrevNext( $prevId, $nextId ) {
                $currentLimit = $this->opts->getValue( 'limit' );
-               $prev = wfMessage( 'whatlinkshere-prev' )->numParams( $currentLimit )->escaped();
-               $next = wfMessage( 'whatlinkshere-next' )->numParams( $currentLimit )->escaped();
+               $prev = $this->msg( 'whatlinkshere-prev' )->numParams( $currentLimit )->escaped();
+               $next = $this->msg( 'whatlinkshere-next' )->numParams( $currentLimit )->escaped();
 
                $changed = $this->opts->getChangedValues();
                unset($changed['target']); // Already in the request title
@@ -380,7 +380,7 @@ class SpecialWhatLinksHere extends SpecialPage {
 
                $nums = $lang->pipeList( $limitLinks );
 
-               return wfMsgHtml( 'viewprevnext', $prev, $next, $nums );
+               return $this->msg( 'viewprevnext' )->rawParams( $prev, $next, $nums )->escaped();
        }
 
        function whatlinkshereForm() {
@@ -403,22 +403,22 @@ class SpecialWhatLinksHere extends SpecialPage {
                        $f .= Html::hidden( $name, $value );
                }
 
-               $f .= Xml::fieldset( wfMsg( 'whatlinkshere' ) );
+               $f .= Xml::fieldset( $this->msg( 'whatlinkshere' )->text() );
 
                # Target input
-               $f .= Xml::inputLabel( wfMsg( 'whatlinkshere-page' ), 'target',
+               $f .= Xml::inputLabel( $this->msg( 'whatlinkshere-page' )->text(), 'target',
                                'mw-whatlinkshere-target', 40, $target );
 
                $f .= ' ';
 
                # Namespace selector
-               $f .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+               $f .= Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' .
                        Xml::namespaceSelector( $namespace, '' );
 
                $f .= ' ';
 
                # Submit
-               $f .= Xml::submitButton( wfMsg( 'allpagessubmit' ) );
+               $f .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() );
 
                # Close
                $f .= Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ) . "\n";
@@ -432,8 +432,8 @@ class SpecialWhatLinksHere extends SpecialPage {
         * @return string HTML fieldset and filter panel with the show/hide links
         */
        function getFilterPanel() {
-               $show = wfMsgHtml( 'show' );
-               $hide = wfMsgHtml( 'hide' );
+               $show = $this->msg( 'show' )->escaped();
+               $hide = $this->msg( 'hide' )->escaped();
 
                $changed = $this->opts->getChangedValues();
                unset($changed['target']); // Already in the request title
@@ -449,8 +449,9 @@ class SpecialWhatLinksHere extends SpecialPage {
                        $chosen = $this->opts->getValue( $type );
                        $msg = $chosen ? $show : $hide;
                        $overrides = array( $type => !$chosen );
-                       $links[] =  wfMsgHtml( "whatlinkshere-{$type}", $this->makeSelfLink( $msg, array_merge( $changed, $overrides ) ) );
+                       $links[] =  $this->msg( "whatlinkshere-{$type}" )->rawParams(
+                               $this->makeSelfLink( $msg, array_merge( $changed, $overrides ) ) )->escaped();
                }
-               return Xml::fieldset( wfMsg( 'whatlinkshere-filters' ), $this->getLanguage()->pipeList( $links ) );
+               return Xml::fieldset( $this->msg( 'whatlinkshere-filters' )->text(), $this->getLanguage()->pipeList( $links ) );
        }
 }