From 7c5aea9eb0e818180897e1cc62336eaf22a355a1 Mon Sep 17 00:00:00 2001
From: Daimona Eaytoy <daimona.wiki@gmail.com>
Date: Tue, 5 Jan 2021 15:06:19 +0100
Subject: [PATCH] SECURITY: Don't filter suppressions

Bug: T71617
Change-Id: I38a0a24fa32ca7a052b6940864a32b3856e84553
---
 includes/AbuseFilterHooks.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/AbuseFilterHooks.php b/includes/AbuseFilterHooks.php
index db2f994a..1d2d2591 100644
--- a/includes/AbuseFilterHooks.php
+++ b/includes/AbuseFilterHooks.php
@@ -353,10 +353,15 @@ class AbuseFilterHooks {
 	 * @param string $reason
 	 * @param string &$error
 	 * @param Status $status
+	 * @param bool $suppress
 	 * @return bool
 	 */
 	public static function onArticleDelete( WikiPage $article, User $user, $reason, &$error,
-		Status $status ) {
+		Status $status, $suppress ) {
+		if ( $suppress ) {
+			// Don't filter suppressions, T71617
+			return true;
+		}
 		$builder = AbuseFilterServices::getVariableGeneratorFactory()->newRunGenerator( $user, $article->getTitle() );
 		$vars = $builder->getDeleteVars( $reason );
 		$runnerFactory = AbuseFilterServices::getFilterRunnerFactory();