diff options
Diffstat (limited to 'modules/setting/mailer.go')
| -rw-r--r-- | modules/setting/mailer.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index d7713f3b80..5da520171e 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -79,13 +79,15 @@ func newMailService() { MailService.From = sec.Key("FROM").MustString(MailService.User) MailService.EnvelopeFrom = sec.Key("ENVELOPE_FROM").MustString("") + // FIXME: DEPRECATED to be removed in v1.18.0 + deprecatedSetting("mailer", "ENABLE_HTML_ALTERNATIVE", "mailer", "SEND_AS_PLAIN_TEXT") if sec.HasKey("ENABLE_HTML_ALTERNATIVE") { - log.Warn("ENABLE_HTML_ALTERNATIVE is deprecated, use SEND_AS_PLAIN_TEXT") MailService.SendAsPlainText = !sec.Key("ENABLE_HTML_ALTERNATIVE").MustBool(false) } + // FIXME: DEPRECATED to be removed in v1.18.0 + deprecatedSetting("mailer", "USE_SENDMAIL", "mailer", "MAILER_TYPE") if sec.HasKey("USE_SENDMAIL") { - log.Warn("USE_SENDMAIL is deprecated, use MAILER_TYPE=sendmail") if MailService.MailerType == "" && sec.Key("USE_SENDMAIL").MustBool(false) { MailService.MailerType = "sendmail" } |