diff --git a/extension.json b/extension.json index 60f155c03..cf90fcb74 100644 --- a/extension.json +++ b/extension.json @@ -11,7 +11,7 @@ "license-name": "GPL-2.0-or-later", "type": "antispam", "requires": { - "MediaWiki": ">= 1.32.0" + "MediaWiki": ">= 1.33.0" }, "AvailableRights": [ "abusefilter-modify", @@ -231,7 +231,7 @@ "Hooks": { "EditFilterMergedContent": "AbuseFilterHooks::onEditFilterMergedContent", "GetAutoPromoteGroups": "AbuseFilterHooks::onGetAutoPromoteGroups", - "MovePageCheckPermissions": "AbuseFilterHooks::onMovePageCheckPermissions", + "TitleMove": "AbuseFilterHooks::onTitleMove", "ArticleDelete": "AbuseFilterHooks::onArticleDelete", "RecentChange_save": "AbuseFilterHooks::onRecentChangeSave", "ListDefinedTags": "AbuseFilterHooks::onListDefinedTags", diff --git a/includes/AbuseFilterHooks.php b/includes/AbuseFilterHooks.php index 3e975e5cb..244934119 100644 --- a/includes/AbuseFilterHooks.php +++ b/includes/AbuseFilterHooks.php @@ -314,11 +314,14 @@ class AbuseFilterHooks { * @param Title $newTitle * @param User $user * @param string $reason - * @param Status $status - * @return bool + * @param Status &$status */ - public static function onMovePageCheckPermissions( Title $oldTitle, Title $newTitle, - User $user, $reason, Status $status + public static function onTitleMove( + Title $oldTitle, + Title $newTitle, + User $user, + $reason, + Status &$status ) { $vars = new AbuseFilterVariableHolder; $vars->addHolders( @@ -331,8 +334,6 @@ class AbuseFilterHooks { $result = AbuseFilter::filterAction( $vars, $oldTitle, 'default', $user ); $status->merge( $result ); - - return $result->isOK(); } /** diff --git a/tests/phpunit/AbuseFilterConsequencesTest.php b/tests/phpunit/AbuseFilterConsequencesTest.php index 3e944daa1..647d1243a 100644 --- a/tests/phpunit/AbuseFilterConsequencesTest.php +++ b/tests/phpunit/AbuseFilterConsequencesTest.php @@ -420,8 +420,8 @@ class AbuseFilterConsequencesTest extends MediaWikiTestCase { } break; case 'move': - $move = new MovePage( $target, Title::newFromText( $params['newTitle'] ) ); - $status = $move->checkPermissions( self::$mUser, 'AbuseFilter move test' ); + $mp = new MovePage( $target, Title::newFromText( $params['newTitle'] ) ); + $status = $mp->move( self::$mUser, 'AbuseFilter move test', false, [] ); break; case 'delete': $page = WikiPage::factory( $target );