wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 10:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use the updated TitleMove hook to filter move actions"

Browse source
This commit is contained in:
jenkins-bot 2018-12-04 19:32:04 +00:00 committed by Gerrit Code Review
parent 23a7aa69a5 206bdc1f6a
commit 1dd8f41d0d
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extension.json
View file

@ -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",

13
includes/AbuseFilterHooks.php
View file

@ -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();
}
/**

4
tests/phpunit/AbuseFilterConsequencesTest.php
View file

@ -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 );