Bit of work to AbortMove hook, in preparation for making the SpamBlacklist work on...

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 6916a77..2357c65 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -254,6 +254,7 @@ $old: old title
 $nt: new title
 $user: user who is doing the move
 $err: error message
+$reason: the reason for the move (added in 1.13)
 
 'AbortNewAccount': Return false to cancel account creation.
 $user: the User object about to be created (read-only, incomplete)

diff --git a/includes/Title.php b/includes/Title.php
index dad2bc4..459a7ae 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2394,9 +2394,10 @@ class Title {
         * @param Title &$nt the new title
         * @param bool $auth indicates whether $wgUser's permissions
         *      should be checked
+        * @param string $reason is the log summary of the move, used for spam checking
         * @return mixed True on success, getUserPermissionsErrors()-like array on failure
         */
-       public function isValidMoveOperation( &$nt, $auth = true ) {
+       public function isValidMoveOperation( &$nt, $auth = true, $reason = '' ) {
                $errors = array();      
                if( !$nt ) {
                        // Normally we'd add this to $errors, but we'll get
@@ -2446,7 +2447,7 @@ class Title {
 
                global $wgUser;
                $err = null;
-               if( !wfRunHooks( 'AbortMove', array( $this, $nt, $wgUser, &$err ) ) ) {
+               if( !wfRunHooks( 'AbortMove', array( $this, $nt, $wgUser, &$err, $reason ) ) ) {
                        $errors[] = array('hookaborted', $err);
                }
 
@@ -2481,7 +2482,7 @@ class Title {
         * @return mixed true on success, getUserPermissionsErrors()-like array on failure
         */
        public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) {
-               $err = $this->isValidMoveOperation( $nt, $auth );
+               $err = $this->isValidMoveOperation( $nt, $auth, $reason );
                if( is_array( $err ) ) {
                        return $err;
                }