Merge branch 'feature/6196_SupportForAttachments' into 1.10.x

# Conflicts: # src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
OrchardCMS · Oct 21, 2016 · bf2201c · bf2201c
2 parents 67af300 + 580b79c
commit bf2201c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
@@ -124,6 +124,8 @@ public class SmtpMessageChannel : Component, ISmtpChannel, IDisposable {
                 foreach (var attachmentPath in emailMessage.Attachments) {
                     if (File.Exists(attachmentPath)) {
                         mailMessage.Attachments.Add(new Attachment(attachmentPath));
+                    } else {
+                        throw new FileNotFoundException(T("One or more attachments not found.").Text);
                     }
                 }
                 _smtpClientField.Value.Send(mailMessage);