From: Reedy <reedy@wikimedia.org>
Date: Tue, 3 Jul 2012 23:14:33 +0000 (+0100)
Subject: f-prot isn't so open now, so might aswell not advertise it in DefaultSetttings under... 
X-Git-Tag: 1.31.0-rc.0~23150^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=cdfc16d0afa4286cf47b76ccaca3d83fd02ec458;p=lhc%2Fweb%2Fwiklou.git

f-prot isn't so open now, so might aswell not advertise it in DefaultSetttings under antivirus

Change-Id: I2f9e1ced05e434655202ee3b425b90344d854065
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index c1a25e1db1..f357555fe5 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -22,6 +22,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
   path info from REQUEST_URI if it's available.
 * The user right 'upload_by_url' is no longer given to sysops by default.
   This only affects installations which have $wgAllowCopyUploads set to true.
+* Removed f-prot support from $wgAntivirusSetup.
 
 === New features in 1.20 ===
 * Added TitleIsAlwaysKnown hook which gets called when determining if a page exists.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e2828b9297..7441932c37 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -912,20 +912,6 @@ $wgAntivirusSetup = array(
 
 		'messagepattern' => '/.*?:(.*)/sim',
 	),
-
-	#setup for f-prot
-	'f-prot' => array (
-		'command' => "f-prot ",
-
-		'codemap' => array (
-			"0" => AV_NO_VIRUS, # no virus
-			"3" => AV_VIRUS_FOUND, # virus found
-			"6" => AV_VIRUS_FOUND, # virus found
-			"*" => AV_SCAN_FAILED, # else scan failed
-		),
-
-		'messagepattern' => '/.*?Infection:(.*)$/m',
-	),
 );