diff --git a/lang/en/antivirus.php b/lang/en/antivirus.php index 27a0c795212..ce81bc52ef4 100644 --- a/lang/en/antivirus.php +++ b/lang/en/antivirus.php @@ -27,4 +27,7 @@ $string['antiviruses'] = 'Antivirus plugins'; $string['antivirussettings'] = 'Manage antivirus plugins'; $string['configantivirusplugins'] = 'Please choose the antivirus plugins you wish to use and arrange them in order of being applied.'; $string['emailsubject'] = '{$a} :: Antivirus notification'; -$string['virusfounduser'] = 'The file you have uploaded, {$a->filename}, has been scanned by a virus checker and found to be infected! Your file upload was NOT successful.'; +$string['virusfound'] = '{$a->item} has been scanned by a virus checker and found to be infected!'; + +// Deprecated since Moodle 3.5. +$string['virusfounduser'] = 'The file you have uploaded, {$a->filename}, has been scanned by a virus checker and found to be infected! Your file upload was NOT successful.'; \ No newline at end of file diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 06ce696e416..db1cf82c36d 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -147,3 +147,4 @@ groupaddnewnote,core_notes selectnotestate,core_notes extendenrol,core groupextendenrol,core +virusfounduser,core_antivirus diff --git a/lib/classes/antivirus/manager.php b/lib/classes/antivirus/manager.php index 784ce9719f7..2e0335e8269 100644 --- a/lib/classes/antivirus/manager.php +++ b/lib/classes/antivirus/manager.php @@ -75,7 +75,7 @@ class manager { if ($deleteinfected) { unlink($file); } - throw new \core\antivirus\scanner_exception('virusfounduser', '', array('filename' => $filename)); + throw new \core\antivirus\scanner_exception('virusfound', '', array('item' => $filename)); } } }