diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-09 10:04:48 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 10:04:48 -0600 |
| commit | a6309aaf48e216fe5f6779188071d4b621b643b6 (patch) | |
| tree | 9abbac7f172822e2286c755725fe3533cde8de8a /app/email.go | |
| parent | 7e8106b95c11a4187f8c00256f3067433d20b24e (diff) | |
| download | chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.gz chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.bz2 chat-a6309aaf48e216fe5f6779188071d4b621b643b6.zip | |
Remove license globals entirely (#8229)
* remove license globals entirely
* fix infinite recursion
* test fix
Diffstat (limited to 'app/email.go')
| -rw-r--r-- | app/email.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/email.go b/app/email.go index b809b972d..89de2ae65 100644 --- a/app/email.go +++ b/app/email.go @@ -316,5 +316,6 @@ func (a *App) NewEmailTemplate(name, locale string) *utils.HTMLTemplate { } func (a *App) SendMail(to, subject, htmlBody string) *model.AppError { - return utils.SendMailUsingConfig(to, subject, htmlBody, a.Config()) + license := a.License() + return utils.SendMailUsingConfig(to, subject, htmlBody, a.Config(), license != nil && *license.Features.Compliance) } |