Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/247556

Change subject: Remove support for MediaWiki 1.24 'AbortMove' hook
......................................................................

Remove support for MediaWiki 1.24 'AbortMove' hook

TitleBlacklist already only supports MediaWiki 1.25+ (see TitleBlacklist.php).

Change-Id: Iea583f31913e57c76d2c755d85deb65cfc935190
---
M TitleBlacklist.hooks.php
M extension.json
2 files changed, 0 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist 
refs/changes/56/247556/1

diff --git a/TitleBlacklist.hooks.php b/TitleBlacklist.hooks.php
index d2e2c36..3b45506 100644
--- a/TitleBlacklist.hooks.php
+++ b/TitleBlacklist.hooks.php
@@ -107,32 +107,6 @@
        }
 
        /**
-        * AbortMove hook (<1.24)
-        *
-        * @todo: Remove once 1.24 support is dropped
-        *
-        * @param $old Title
-        * @param $nt Title
-        * @param $user User
-        * @param $err
-        * @return bool
-        */
-       public static function abortMove( $old, $nt, $user, &$err, $reason ) {
-               if ( method_exists( 'MovePage', 'checkPermissions' ) ) {
-                       // Don't use this hook, use MovePageCheckPermissions 
instead
-                       return true;
-               }
-
-               $status = new Status();
-               self::onMovePageCheckPermissions( $old, $nt, $user, $reason, 
$status );
-               if ( !$status->isOK() ) {
-                       $err = $status->getHTML();
-               }
-
-               return $status->isOK();
-       }
-
-       /**
         * Check whether a user name is acceptable,
         * and set a message if unacceptable.
         *
diff --git a/extension.json b/extension.json
index e5b9ed6..384ed22 100644
--- a/extension.json
+++ b/extension.json
@@ -63,9 +63,6 @@
                "TitleGetEditNotices": [
                        "TitleBlacklistHooks::displayBlacklistOverrideNotice"
                ],
-               "AbortMove": [
-                       "TitleBlacklistHooks::abortMove"
-               ],
                "MovePageCheckPermissions": [
                        "TitleBlacklistHooks::onMovePageCheckPermissions"
                ],

-- 
To view, visit https://gerrit.wikimedia.org/r/247556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea583f31913e57c76d2c755d85deb65cfc935190
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to