Merge "Sync up with Parsoid parserTests."

[lhc/web/wiklou.git] / includes / specials / SpecialMovepage.php

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index f49d730..9cc6745 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -139,8 +139,6 @@ class MovePageForm extends UnlistedSpecialPage {
         *    parameters, like the second argument to OutputPage::wrapWikiMsg().
         */
        function showForm( $err ) {
-               global $wgContLang;
-
                $this->getSkin()->setRelevantTitle( $this->oldTitle );
 
                $out = $this->getOutput();
@@ -316,7 +314,7 @@ class MovePageForm extends UnlistedSpecialPage {
                                'title' => [
                                        'id' => 'wpNewTitleMain',
                                        'name' => 'wpNewTitleMain',
-                                       'value' => $wgContLang->recodeForEdit( $newTitle->getText() ),
+                                       'value' => $newTitle->getText(),
                                        // Inappropriate, since we're expecting the user to input a non-existent page's title
                                        'suggestions' => false,
                                ],
@@ -355,6 +353,7 @@ class MovePageForm extends UnlistedSpecialPage {
                                        'help' => new OOUI\HtmlSnippet( $this->msg( 'movepagetalktext' )->parseAsBlock() ),
                                        'align' => 'inline',
                                        'infusable' => true,
+                                       'id' => 'wpMovetalk-field',
                                ]
                        );
                }
@@ -601,13 +600,14 @@ class MovePageForm extends UnlistedSpecialPage {
                $out = $this->getOutput();
                $out->setPageTitle( $this->msg( 'pagemovedsub' ) );
 
-               $oldLink = Linker::link(
+               $linkRenderer = $this->getLinkRenderer();
+               $oldLink = $linkRenderer->makeLink(
                        $ot,
                        null,
                        [ 'id' => 'movepage-oldlink' ],
                        [ 'redirect' => 'no' ]
                );
-               $newLink = Linker::linkKnown(
+               $newLink = $linkRenderer->makeKnownLink(
                        $nt,
                        null,
                        [ 'id' => 'movepage-newlink' ]
@@ -723,7 +723,7 @@ class MovePageForm extends UnlistedSpecialPage {
                        # be longer than 255 characters.
                        $newSubpage = Title::makeTitleSafe( $newNs, $newPageName );
                        if ( !$newSubpage ) {
-                               $oldLink = Linker::linkKnown( $oldSubpage );
+                               $oldLink = $linkRenderer->makeKnownLink( $oldSubpage );
                                $extraOutput[] = $this->msg( 'movepage-page-unmoved' )->rawParams( $oldLink )
                                        ->params( Title::makeName( $newNs, $newPageName ) )->escaped();
                                continue;
@@ -731,7 +731,7 @@ class MovePageForm extends UnlistedSpecialPage {
 
                        # This was copy-pasted from Renameuser, bleh.
                        if ( $newSubpage->exists() && !$oldSubpage->isValidMoveTarget( $newSubpage ) ) {
-                               $link = Linker::linkKnown( $newSubpage );
+                               $link = $linkRenderer->makeKnownLink( $newSubpage );
                                $extraOutput[] = $this->msg( 'movepage-page-exists' )->rawParams( $link )->escaped();
                        } else {
                                $success = $oldSubpage->moveTo( $newSubpage, true, $this->reason, $createRedirect );
@@ -740,14 +740,14 @@ class MovePageForm extends UnlistedSpecialPage {
                                        if ( $this->fixRedirects ) {
                                                DoubleRedirectJob::fixRedirects( 'move', $oldSubpage, $newSubpage );
                                        }
-                                       $oldLink = Linker::link(
+                                       $oldLink = $linkRenderer->makeLink(
                                                $oldSubpage,
                                                null,
                                                [],
                                                [ 'redirect' => 'no' ]
                                        );
 
-                                       $newLink = Linker::linkKnown( $newSubpage );
+                                       $newLink = $linkRenderer->makeKnownLink( $newSubpage );
                                        $extraOutput[] = $this->msg( 'movepage-page-moved' )
                                                ->rawParams( $oldLink, $newLink )->escaped();
                                        ++$count;
@@ -759,8 +759,8 @@ class MovePageForm extends UnlistedSpecialPage {
                                                break;
                                        }
                                } else {
-                                       $oldLink = Linker::linkKnown( $oldSubpage );
-                                       $newLink = Linker::link( $newSubpage );
+                                       $oldLink = $linkRenderer->makeKnownLink( $oldSubpage );
+                                       $newLink = $linkRenderer->makeLink( $newSubpage );
                                        $extraOutput[] = $this->msg( 'movepage-page-unmoved' )
                                                ->rawParams( $oldLink, $newLink )->escaped();
                                }
@@ -804,8 +804,9 @@ class MovePageForm extends UnlistedSpecialPage {
                $out->addWikiMsg( 'movesubpagetext', $this->getLanguage()->formatNum( $count ) );
                $out->addHTML( "<ul>\n" );
 
+               $linkRenderer = $this->getLinkRenderer();
                foreach ( $subpages as $subpage ) {
-                       $link = Linker::link( $subpage );
+                       $link = $linkRenderer->makeLink( $subpage );
                        $out->addHTML( "<li>$link</li>\n" );
                }
                $out->addHTML( "</ul>\n" );