Custom error message from the AbortMove hook is now passed in the same array as the...

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 5d00e9f..955dd54 100644 (file)
--- 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 {