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

HermesSbicego-Laser · HermesSbicego-Laser · commit bf2201c2a9a0 · 2016-10-21T18:40:21.000+02:00
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
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 void Process(IDictionary<string, object> parameters) {
                 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);

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ public void Process(IDictionary<string, object> parameters) {`
`124`	`124`	`foreach (var attachmentPath in emailMessage.Attachments) {`
`125`	`125`	`if (File.Exists(attachmentPath)) {`
`126`	`126`	`mailMessage.Attachments.Add(new Attachment(attachmentPath));`
	`127`	`+ } else {`
	`128`	`+ throw new FileNotFoundException(T("One or more attachments not found.").Text);`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`	`_smtpClientField.Value.Send(mailMessage);`