MDL-44257 message: check if the attachment exists before remove it

Credit goes to Mark Nielsen, thanks.

diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index cfe9fd4..4b95db1 100644 (file)
--- a/message/output/email/message_output_email.php
+++ b/message/output/email/message_output_email.php
@@ -88,7 +88,9 @@ class message_output_email extends message_output {
                                 $eventdata->fullmessagehtml, $attachment, $attachname);
 
         // Remove an attachment file if any.
-        @unlink($attachment);
+        if (!empty($attachment) && file_exists($CFG->dataroot.'/'.$attachment)) {
+            unlink($CFG->dataroot.'/'.$attachment);
+        }
 
         return $result;
     }