From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Fri, 27 Nov 2015 01:22:56 +0000 (+0100)
Subject: SpecialMovePage: Display introduction text even after the form was submitted
X-Git-Tag: 1.31.0-rc.0~8859
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=b16e7455cd9d906e67ef588fb6b2ef5369189d67

SpecialMovePage: Display introduction text even after the form was submitted

I see no reason to remove this helpful information just because there's
an error in the form.

Change-Id: I01c6d66231c272d0ef0c671c388c7aa43020b4a3
---

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 9133a88639..fd2f4c7156 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -146,6 +146,26 @@ class MovePageForm extends UnlistedSpecialPage {
 		$out->addModuleStyles( 'mediawiki.special.movePage.styles' );
 		$this->addHelpLink( 'Help:Moving a page' );
 
+		if ( $this->oldTitle->getNamespace() == NS_USER && !$this->oldTitle->isSubpage() ) {
+			$out->wrapWikiMsg(
+				"<div class=\"error mw-moveuserpage-warning\">\n$1\n</div>",
+				'moveuserpage-warning'
+			);
+		} elseif ( $this->oldTitle->getNamespace() == NS_CATEGORY ) {
+			$out->wrapWikiMsg(
+				"<div class=\"error mw-movecategorypage-warning\">\n$1\n</div>",
+				'movecategorypage-warning'
+			);
+		}
+
+		$out->addWikiMsg( $this->getConfig()->get( 'FixDoubleRedirects' ) ?
+			'movepagetext' :
+			'movepagetext-noredirectfixer'
+		);
+		$movepagebtn = $this->msg( 'movepagebtn' )->text();
+		$submitVar = 'wpMove';
+		$confirm = false;
+
 		$newTitle = $this->newTitle;
 
 		if ( !$newTitle ) {
@@ -172,26 +192,6 @@ class MovePageForm extends UnlistedSpecialPage {
 			$submitVar = 'wpDeleteAndMove';
 			$confirm = true;
 			$err = array();
-		} else {
-			if ( $this->oldTitle->getNamespace() == NS_USER && !$this->oldTitle->isSubpage() ) {
-				$out->wrapWikiMsg(
-					"<div class=\"error mw-moveuserpage-warning\">\n$1\n</div>",
-					'moveuserpage-warning'
-				);
-			} elseif ( $this->oldTitle->getNamespace() == NS_CATEGORY ) {
-				$out->wrapWikiMsg(
-					"<div class=\"error mw-movecategorypage-warning\">\n$1\n</div>",
-					'movecategorypage-warning'
-				);
-			}
-
-			$out->addWikiMsg( $this->getConfig()->get( 'FixDoubleRedirects' ) ?
-				'movepagetext' :
-				'movepagetext-noredirectfixer'
-			);
-			$movepagebtn = $this->msg( 'movepagebtn' )->text();
-			$submitVar = 'wpMove';
-			$confirm = false;
 		}
 
 		if ( count( $err ) == 1 && isset( $err[0][0] ) && $err[0][0] == 'file-exists-sharedrepo'