* (bug 34887) Fix for r100138: make $3 and $4 parameters being substituted correctly...

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

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 12fdeed..393cf7e 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -55,6 +55,13 @@ class MovePageForm extends UnlistedSpecialPage {
                $oldTitleText = $request->getVal( 'wpOldTitle', $target );
                $this->oldTitle = Title::newFromText( $oldTitleText );
 
+               if( is_null( $this->oldTitle ) ) {
+                       throw new ErrorPageError( 'notargettitle', 'notargettext' );
+               }
+               if( !$this->oldTitle->exists() ) {
+                       throw new ErrorPageError( 'nopagetitle', 'nopagetext' );
+               }
+
                $newTitleTextMain = $request->getText( 'wpNewTitleMain' );
                $newTitleTextNs = $request->getInt( 'wpNewTitleNs', $this->oldTitle->getNamespace() );
                // Backwards compatibility for forms submitting here from other sources
@@ -64,12 +71,6 @@ class MovePageForm extends UnlistedSpecialPage {
                        ? Title::newFromText( $newTitleText_bc )
                        : Title::makeTitleSafe( $newTitleTextNs, $newTitleTextMain );
 
-               if( is_null( $this->oldTitle ) ) {
-                       throw new ErrorPageError( 'notargettitle', 'notargettext' );
-               }
-               if( !$this->oldTitle->exists() ) {
-                       throw new ErrorPageError( 'nopagetitle', 'nopagetext' );
-               }
 
                $user = $this->getUser();
 
@@ -383,7 +384,7 @@ class MovePageForm extends UnlistedSpecialPage {
        }
 
        function doSubmit() {
-               global $wgMaximumMovedPages, $wgFixDoubleRedirects, $wgDeleteRevisionsLimit;
+               global $wgMaximumMovedPages, $wgFixDoubleRedirects;
 
                $user = $this->getUser();
 
@@ -458,7 +459,7 @@ class MovePageForm extends UnlistedSpecialPage {
                wfRunHooks( 'SpecialMovepageAfterMove', array( &$this, &$ot, &$nt ) );
 
                $out = $this->getOutput();
-               $out->setPagetitle( wfMsg( 'pagemovedsub' ) );
+               $out->setPageTitle( $this->msg( 'pagemovedsub' ) );
 
                $oldLink = Linker::link(
                        $ot,
@@ -471,7 +472,8 @@ class MovePageForm extends UnlistedSpecialPage {
                $newText = $nt->getPrefixedText();
 
                $msgName = $createRedirect ? 'movepage-moved-redirect' : 'movepage-moved-noredirect';
-               $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( $oldLink, $newLink, $oldText, $newText )->parseAsBlock() );
+               $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( $oldLink,
+                       $newLink )->params( $oldText, $newText )->parseAsBlock() );
                $out->addWikiMsg( $msgName );
 
                # Now we move extra pages we've been asked to move: subpages and talk