From f15b2a92da1a13c466e0713bb359222c86463b3a Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 2 Oct 2008 18:19:22 +0000
Subject: [PATCH] Custom error message from the AbortMove hook is now passed in
 the same array as the hookaborted message

---
 includes/specials/SpecialMovepage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 5d00e9fec3..955dd54367 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -78,7 +78,7 @@ class MovePageForm {
 		$this->watch = $wgRequest->getCheck( 'wpWatch' );
 	}
 
-	function showForm( $err, $hookErr = '' ) {
+	function showForm( $err ) {
 		global $wgOut, $wgUser;
 
 		$skin = $wgUser->getSkin();
@@ -150,6 +150,7 @@ class MovePageForm {
 		if ( !empty($err) ) {
 			$wgOut->setSubtitle( wfMsg( 'formerror' ) );
 			if( $err[0] == 'hookaborted' ) {
+				$hookErr = $err[1];
 				$errMsg = "<p><strong class=\"error\">$hookErr</strong></p>\n";
 				$wgOut->addHTML( $errMsg );
 			} else {
-- 
2.20.1