Skip to content

Commit

Permalink
Merge pull request #306 from conneqtech/template-predefined-sender
Browse files Browse the repository at this point in the history
We can set default From in templates, so this should be no longer required when sending templated mails
  • Loading branch information
thrawn01 committed Jun 19, 2023
2 parents dd31e58 + 51f532e commit ca9d440
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -795,10 +795,6 @@ func isValid(m *Message) bool {
}

func (pm *plainMessage) isValid() bool {
if pm.from == "" {
return false
}

if !validateStringList(pm.cc, false) {
return false
}
Expand All @@ -812,6 +808,10 @@ func (pm *plainMessage) isValid() bool {
return true
}

if pm.from == "" {
return false
}

if pm.text == "" && pm.html == "" {
return false
}
Expand Down

0 comments on commit ca9d440

Please sign in to comment.