From 33a33c0b5f6a511ee46c0baf8f973742aee7d091 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 5 Feb 2019 23:23:57 -0500 Subject: [PATCH 1/3] Fix #5972 --- templates/admin/config.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index c3d76687f1848..58c6a7591b814 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -184,7 +184,7 @@ {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
{{.Mailer.Name}}
- {{if not .Mailer.UseSendmail}} + {{if not .Mailer.MailerType == "sendmail"}}
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
{{.i18n.Tr "admin.config.mailer_host"}}
From 750c1e598dc30f461e1db8296f3b8c269b854672 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 5 Feb 2019 23:33:09 -0500 Subject: [PATCH 2/3] Update config.tmpl --- templates/admin/config.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 58c6a7591b814..b28d66b649d51 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -184,7 +184,7 @@ {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
{{.Mailer.Name}}
- {{if not .Mailer.MailerType == "sendmail"}} + {{if ne .Mailer.MailerType "sendmail"}}
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
{{.i18n.Tr "admin.config.mailer_host"}}
From 34ca47371d8e1999978e99688b690161be905bed Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 6 Feb 2019 11:06:39 -0500 Subject: [PATCH 3/3] Update config.tmpl --- templates/admin/config.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index b28d66b649d51..2d660117d510e 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -184,12 +184,12 @@ {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
{{.Mailer.Name}}
- {{if ne .Mailer.MailerType "sendmail"}} + {{if eq .Mailer.MailerType "smtp"}}
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
{{.i18n.Tr "admin.config.mailer_host"}}
{{.Mailer.Host}}
- {{else}} + {{else if eq .Mailer.MailerType "sendmail"}}
{{.i18n.Tr "admin.config.mailer_use_sendmail"}}
{{.i18n.Tr "admin.config.mailer_sendmail_path"}}